Fijxu/invidious
4
4
Fork 2
Code Issues 21 Pull requests Projects Releases Packages 1 Wiki Activity Actions

External Proxies: Use list of external videoplayback proxies

Browse source
This commit is contained in:
Fijxu 2024-10-11 13:50:42 -03:00
parent 08d2471ebd
commit d189e2ee6e
Signed by: Fijxu
GPG key ID: 32C1DDF333EDA6A4
5 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/invidious.cr
View file

@ -189,7 +189,7 @@ Invidious::Jobs.register Invidious::Jobs::ClearExpiredItemsJob.new
Invidious::Jobs.register Invidious::Jobs::InstanceListRefreshJob.new Invidious::Jobs.register Invidious::Jobs::InstanceListRefreshJob.new
if CONFIG.external_videoplayback_proxy if !CONFIG.external_videoplayback_proxy.empty?
Invidious::Jobs.register Invidious::Jobs::CheckExternalProxy.new Invidious::Jobs.register Invidious::Jobs::CheckExternalProxy.new
end end

4
src/invidious/config.cr
View file

@ -180,7 +180,9 @@ class Config
# of the backend # of the backend
property backends_delimiter : String = "|" property backends_delimiter : String = "|"
property external_videoplayback_proxy : String? # External videoplayback proxies list. They should include `https://`
# at the start of the URI
property external_videoplayback_proxy : Array(String) = [] of String
# Materialious redirects # Materialious redirects
property materialious_domain : String? property materialious_domain : String?

18
src/invidious/http_server/utils.cr
View file

@ -4,14 +4,20 @@ module Invidious::HttpServer
module Utils module Utils
extend self extend self
@@proxy_alive : Bool = false @@proxy_alive : String = ""
def check_external_proxy def check_external_proxy
CONFIG.external_videoplayback_proxy.each do |proxy|
begin begin
response = HTTP::Client.get("#{CONFIG.external_videoplayback_proxy}") response = HTTP::Client.get(proxy)
@@proxy_alive = response.status_code == 200 if response.status_code == 200
@@proxy_alive = proxy
LOGGER.debug("CheckExternalProxy: Proxy set to: '#{proxy}'")
break
end
rescue rescue
@@proxy_alive = false LOGGER.debug("CheckExternalProxy: Proxy '#{proxy}' is not available")
end
end end
end end
@ -25,8 +31,8 @@ module Invidious::HttpServer
url.query_params = params url.query_params = params
if absolute if absolute
if @@proxy_alive if !@@proxy_alive.empty?
return "#{CONFIG.external_videoplayback_proxy}#{url.request_target}" return "#{@@proxy_alive}#{url.request_target}"
else else
return "#{HOST_URL}#{url.request_target}" return "#{HOST_URL}#{url.request_target}"
end end

8
src/invidious/routes/before_all.cr
View file

@ -28,12 +28,6 @@ module Invidious::Routes::BeforeAll
extra_media_csp = "" extra_media_csp = ""
end end
if CONFIG.external_videoplayback_proxy
external_videoplayback_proxy = " #{CONFIG.external_videoplayback_proxy}"
else
external_videoplayback_proxy = ""
end
# Only allow the pages at /embed/* to be embedded # Only allow the pages at /embed/* to be embedded
if env.request.resource.starts_with?("/embed") if env.request.resource.starts_with?("/embed")
frame_ancestors = "'self' file: http: https:" frame_ancestors = "'self' file: http: https:"
@ -49,7 +43,7 @@ module Invidious::Routes::BeforeAll
"style-src 'self' 'unsafe-inline'", "style-src 'self' 'unsafe-inline'",
"img-src 'self' data:", "img-src 'self' data:",
"font-src 'self' data:", "font-src 'self' data:",
"connect-src 'self'" + external_videoplayback_proxy, "connect-src 'self'" + EXT_VIDEOP_LIST,
"manifest-src 'self'", "manifest-src 'self'",
"media-src 'self' blob:" + extra_media_csp, "media-src 'self' blob:" + extra_media_csp,
"child-src 'self' blob:", "child-src 'self' blob:",