Allow ggpht queries with QUIC disabled

This commit is contained in:
syeopite 2021-10-08 05:55:34 -07:00
parent 245122104a
commit c3747c2d49
No known key found for this signature in database
GPG Key ID: 6FA616E5A5294A82

View File

@ -3,15 +3,27 @@ module Invidious::Routes::Images
def self.ggpht(env) def self.ggpht(env)
url = env.request.path.lchop("/ggpht") url = env.request.path.lchop("/ggpht")
headers = HTTP::Headers{":authority" => "yt3.ggpht.com"} headers = (
{% unless flag?(:disable_quic) %}
if CONFIG.use_quic
HTTP::Headers{":authority" => "yt3.ggpht.com"}
else
HTTP::Headers.new
end
{% else %}
HTTP::Headers.new
{% end %}
)
REQUEST_HEADERS_WHITELIST.each do |header| REQUEST_HEADERS_WHITELIST.each do |header|
if env.request.headers[header]? if env.request.headers[header]?
headers[header] = env.request.headers[header] headers[header] = env.request.headers[header]
end end
end end
begin # We're encapsulating this into a proc in order to easily reuse this
YT_POOL.client &.get(url, headers) do |response| # portion of the code for each request block below.
request_proc = ->(response : HTTP::Client::Response) {
env.response.status_code = response.status_code env.response.status_code = response.status_code
response.headers.each do |key, value| response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase) if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
@ -23,11 +35,29 @@ module Invidious::Routes::Images
if response.status_code >= 300 if response.status_code >= 300
env.response.headers.delete("Transfer-Encoding") env.response.headers.delete("Transfer-Encoding")
break return
end end
proxy_file(response, env) proxy_file(response, env)
}
begin
{% unless flag?(:disable_quic) %}
if CONFIG.use_quic
YT_POOL.client &.get(url, headers) do |resp|
return request_proc.call(resp)
end end
else
HTTP::Client.get("yt3.ggpht.com#{url}") do |resp|
return request_proc.call(resp)
end
end
{% else %}
# This can likely be optimized into a (small) pool sometime in the future.
HTTP::Client.get("yt3.ggpht.com#{url}") do |resp|
return request_proc.call(resp)
end
{% end %}
rescue ex rescue ex
end end
end end