Merge remote-tracking branch 'upstream/master'

src/invidious/routes/before_all.cr

@@ -137,6 +137,7 @@ module Invidious::Routes::BeforeAll
                 "/videoplayback",
                 "/latest_version",
                 "/download",
+                "/companion/",
               }.any? { |r| env.request.resource.starts_with? r }
 
     if env.request.cookies.has_key? "SID"

src/invidious/routes/companion.cr

@@ -0,0 +1,47 @@
+module Invidious::Routes::Companion
+  # /companion
+  def self.get_companion(env)
+    current_companion = env.get("current_companion").as(Int32)
+
+    url = env.request.path
+    if env.request.query
+      url += "?#{env.request.query}"
+    end
+
+    begin
+      COMPANION_POOL[current_companion].client do |wrapper|
+        wrapper.client.get(url, env.request.headers) do |resp|
+          return self.proxy_companion(env, resp)
+        end
+      end
+    rescue ex
+    end
+  end
+
+  def self.options_companion(env)
+    current_companion = env.get("current_companion").as(Int32)
+
+    url = env.request.path
+    if env.request.query
+      url += "?#{env.request.query}"
+    end
+
+    begin
+      COMPANION_POOL[current_companion].client do |wrapper|
+        wrapper.client.options(url, env.request.headers) do |resp|
+          return self.proxy_companion(env, resp)
+        end
+      end
+    rescue ex
+    end
+  end
+
+  private def self.proxy_companion(env, response)
+    env.response.status_code = response.status_code
+    response.headers.each do |key, value|
+      env.response.headers[key] = value
+    end
+
+    return IO.copy response.body_io, env.response
+  end
+end

src/invidious/routes/embed.cr

@@ -210,6 +210,18 @@ module Invidious::Routes::Embed
     if CONFIG.invidious_companion.present?
       current_companion = env.get("current_companion").as(Int32)
       invidious_companion = CONFIG.invidious_companion[current_companion]
+
+      invidious_companion_urls = CONFIG.invidious_companion.reject(&.builtin_proxy).map do |companion|
+        uri =
+          "#{companion.public_url.scheme}://#{companion.public_url.host}#{companion.public_url.port ? ":#{companion.public_url.port}" : ""}"
+      end.join(" ")
+
+      if !invidious_companion_urls.empty?
+        env.response.headers["Content-Security-Policy"] =
+          env.response.headers["Content-Security-Policy"]
+            .gsub("media-src", "media-src #{invidious_companion_urls}")
+            .gsub("connect-src", "connect-src #{invidious_companion_urls}")
+      end
     end
 
     rendered "embed"

src/invidious/routes/preferences.cr

@@ -144,6 +144,8 @@ module Invidious::Routes::PreferencesRoute
     notifications_only ||= "off"
     notifications_only = notifications_only == "on"
 
+    default_playlist = env.params.body["default_playlist"]?.try &.as(String)
+
     hidden_channels = env.params.body["hidden_channels"]?.try &.as(String)
     if hidden_channels
       hidden_channels = hidden_channels.split("\n")
@@ -171,6 +173,7 @@ module Invidious::Routes::PreferencesRoute
     default_trending_type = env.params.body["default_trending_type"]?.try &.as(String)
     default_trending_type ||= Invidious::Routes::Feeds::TrendingTypes::Default
 
+
     # Convert to JSON and back again to take advantage of converters used for compatibility
     preferences = Preferences.from_json({
       annotations:                 annotations,
@@ -207,6 +210,7 @@ module Invidious::Routes::PreferencesRoute
       vr_mode:                     vr_mode,
       show_nick:                   show_nick,
       save_player_pos:             save_player_pos,
+      default_playlist:            default_playlist,
       hidden_channels:             hidden_channels,
       default_trending_type:       default_trending_type,
     }.to_json)

src/invidious/routes/watch.cr

@@ -279,6 +279,18 @@ module Invidious::Routes::Watch
     if CONFIG.invidious_companion.present?
       current_companion = env.get("current_companion").as(Int32)
       invidious_companion = CONFIG.invidious_companion[current_companion]
+
+      invidious_companion_urls = CONFIG.invidious_companion.reject(&.builtin_proxy).map do |companion|
+        uri =
+          "#{companion.public_url.scheme}://#{companion.public_url.host}#{companion.public_url.port ? ":#{companion.public_url.port}" : ""}"
+      end.join(" ")
+
+      if !invidious_companion_urls.empty?
+        env.response.headers["Content-Security-Policy"] =
+          env.response.headers["Content-Security-Policy"]
+            .gsub("media-src", "media-src #{invidious_companion_urls}")
+            .gsub("connect-src", "connect-src #{invidious_companion_urls}")
+      end
     end
 
     templated "watch"