Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2026-09-19 04:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Also add User-Agent for ytimg.com requests (#6038)

Browse Source 
* fix: Also add User-Agent for ytimg.com requests, excluding youtube cookies

* strictly match only youtube.com and ytimg.com subdomains
This commit is contained in:
Fijxu
2026-09-16 00:28:31 -03:00
committed by GitHub
parent 3012b9c0e3
commit c88230067b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/invidious/yt_backend/connection_pool.cr
View File

@@ -104,7 +104,7 @@ struct CompanionConnectionPool
end end
end end
def add_yt_headers(request) def add_yt_headers(request, no_cookies)
request.headers.delete("User-Agent") if request.headers["User-Agent"] == "Crystal" request.headers.delete("User-Agent") if request.headers["User-Agent"] == "Crystal"
request.headers["User-Agent"] ||= "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36" request.headers["User-Agent"] ||= "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36"
@@ -112,10 +112,12 @@ def add_yt_headers(request)
request.headers["Accept"] ||= "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" request.headers["Accept"] ||= "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
request.headers["Accept-Language"] ||= "en-us,en;q=0.5" request.headers["Accept-Language"] ||= "en-us,en;q=0.5"
# Preserve original cookies and add new YT consent cookie for EU servers unless no_cookies
request.headers["Cookie"] = "#{request.headers["cookie"]?}; CONSENT=PENDING+#{Random.rand(100..999)}" # Preserve original cookies and add new YT consent cookie for EU servers
if !CONFIG.cookies.empty? request.headers["Cookie"] = "#{request.headers["cookie"]?}; CONSENT=PENDING+#{Random.rand(100..999)}"
request.headers["Cookie"] = "#{(CONFIG.cookies.map { |c| "#{c.name}=#{c.value}" }).join("; ")}; #{request.headers["cookie"]?}" if !CONFIG.cookies.empty?
request.headers["Cookie"] = "#{(CONFIG.cookies.map { |c| "#{c.name}=#{c.value}" }).join("; ")}; #{request.headers["cookie"]?}"
end
end end
end end
@@ -129,7 +131,16 @@ def make_client(url : URI, region = nil, force_resolve : Bool = false, force_you
client.family = Socket::Family::INET if client.family == Socket::Family::UNSPEC client.family = Socket::Family::INET if client.family == Socket::Family::UNSPEC
end end
client.before_request { |r| add_yt_headers(r) } if url.host.try &.ends_with?("youtube.com") || force_youtube_headers # ytimg.com does not contain any cookies, so we skip the youtube cookies
# for that domain and subdomains (i9.ytimg.com, i.ytimg.com, etc)
yt = url.host.try { |host| host == "youtube.com" || host.ends_with?(".youtube.com") }
ytimg = url.host.try { |host| host == "ytimg.com" || host.ends_with?(".ytimg.com") }
youtube_domain = yt || ytimg
client.before_request do |r|
add_yt_headers(r, ytimg) if youtube_domain || force_youtube_headers
end
client.read_timeout = 10.seconds client.read_timeout = 10.seconds
client.connect_timeout = 10.seconds client.connect_timeout = 10.seconds