Fijxu/invidious
7
7
Fork 3
Code Issues 24 Pull requests Projects Releases Packages 1 Wiki Activity Actions

add CSP based on backend selected by the user
All checks were successful
Invidious CI / build (push) Successful in 5m21s
Details

Browse source
This commit is contained in:
Fijxu 2025-04-02 20:58:16 -03:00
parent 2a91426824
commit 8ec6294114
Signed by: Fijxu
GPG key ID: 32C1DDF333EDA6A4
2 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/invidious/helpers/backend_info.cr
View file

@ -2,12 +2,11 @@ module BackendInfo
extend self extend self
@@exvpp_url : Array(String) = Array.new(CONFIG.invidious_companion.size, "") @@exvpp_url : Array(String) = Array.new(CONFIG.invidious_companion.size, "")
@@status : Array(Int32) = Array.new(CONFIG.invidious_companion.size, 0) @@status : Array(Int32) = Array.new(CONFIG.invidious_companion.size, 0)
@@extra_media_csp : String = "" @@extra_media_csp : Array(String) = Array.new(CONFIG.invidious_companion.size, "")
@@extra_connect_csp : String = "" @@extra_connect_csp : Array(String) = Array.new(CONFIG.invidious_companion.size, "")
def check_backends def check_backends
check_companion() check_companion()
generate_csp()
end end
private def check_companion private def check_companion
@ -16,6 +15,7 @@ module BackendInfo
begin begin
response = HTTP::Client.get "#{companion.private_url}/healthz" response = HTTP::Client.get "#{companion.private_url}/healthz"
if response.status_code == 200 if response.status_code == 200
generate_csp(companion.public_url.to_s, index)
check_videoplayback_proxy(companion, index) check_videoplayback_proxy(companion, index)
else else
@@status[index] = 0 @@status[index] = 0
@ -40,6 +40,7 @@ module BackendInfo
begin begin
exvpp_health = HTTP::Client.get "#{exvpp_url}/health" exvpp_health = HTTP::Client.get "#{exvpp_url}/health"
if exvpp_health.status_code == 200 if exvpp_health.status_code == 200
generate_csp(exvpp_url, index)
@@status[index] = 2 @@status[index] = 2
return return
else else
@ -53,21 +54,9 @@ module BackendInfo
end end
end end
private def generate_csp private def generate_csp(item, index)
@@extra_media_csp = "" @@extra_media_csp[index] += " #{item}"
@@extra_connect_csp = "" @@extra_connect_csp[index] += " #{item}"
CONFIG.invidious_companion.each do |companion|
@@extra_media_csp += " #{companion.public_url}"
@@extra_connect_csp += " #{companion.public_url}"
end
exvpp_urls = self.get_exvpp
exvpp_urls.each do |exvpp_url|
if !exvpp_url.empty?
@@extra_media_csp += " #{exvpp_url}"
@@extra_connect_csp += " #{exvpp_url}"
end
end
end end
def get_status def get_status
@ -78,7 +67,7 @@ module BackendInfo
return @@exvpp_url return @@exvpp_url
end end
def get_csp def get_csp(backend : Int32)
return @@extra_media_csp, @@extra_connect_csp return @@extra_media_csp[backend], @@extra_connect_csp[backend]
end end
end end

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

@ -50,8 +50,7 @@ module Invidious::Routes::BeforeAll
env.set "current_companion", current_companion env.set "current_companion", current_companion
end end
extra_media_csp, extra_connect_csp = BackendInfo.get_csp(env.get("current_companion").as(Int32))
extra_media_csp, extra_connect_csp = BackendInfo.get_csp
end end
if !CONFIG.external_videoplayback_proxy.empty? if !CONFIG.external_videoplayback_proxy.empty?