Allow hls to be disabled via disable_proxy config

iv-org · Sep 28, 2023 · 5685e70 · 5685e70
1 parent b3285e3
commit 5685e70
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -126,7 +126,7 @@ https_only: false
 ## Disable proxying server-wide. Can be disable as a whole, or
 ## only for a single function.
 ##
-## Accepted values: true, false, dash, livestreams, downloads, local
+## Accepted values: true, false, dash, livestreams, downloads, local, hls
 ## Default: false
 ##
 #disable_proxy: false

diff --git a/src/invidious/routes/video_playback.cr b/src/invidious/routes/video_playback.cr
@@ -86,7 +86,7 @@ module Invidious::Routes::VideoPlayback
     end
 
     if url.includes? "&file=seg.ts"
-      if CONFIG.disabled?("livestreams")
+      if CONFIG.disabled?("livestreams") || CONFIG.disabled?("hls")
         return error_template(403, "Administrator has disabled this endpoint.")
       end
 

diff --git a/src/invidious/videos/video_preferences.cr b/src/invidious/videos/video_preferences.cr
@@ -100,8 +100,12 @@ def process_video_params(query, preferences)
   vr_mode = vr_mode == 1
   save_player_pos = save_player_pos == 1
 
-  if CONFIG.disabled?("dash") && quality == "dash"
-    quality = "high"
+  # Force set quality to "high" if dash or hls has been disabled by the server
+  {"dash", "hls"}.each do |disabled_quality|
+    if CONFIG.disabled?("dash") && quality == "dash"
+      quality = "high"
+      break
+    end
   end
 
   if CONFIG.disabled?("local") && local

diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr
@@ -5,7 +5,7 @@
     <% if params.controls %>controls<% end %>>
     <% if (hlsvp = video.hls_manifest_url) && video.live_now && !CONFIG.disabled?("livestreams") %>
         <source src="<%= URI.parse(hlsvp).request_target %><% if params.local %>?local=true<% end %>" type="application/x-mpegURL" label="livestream">
-    <% elsif (hlsvp = video.hls_manifest_url) && params.quality == "hls" %>
+    <% elsif (hlsvp = video.hls_manifest_url) && params.quality == "hls" && !CONFIG.disabled?("hls") %>
         <source src="<%= URI.parse(hlsvp).request_target %><% if params.local %>?local=true<% end %>" type="application/x-mpegURL" label="HLS">
     <% else %>
         <% if params.listen %>

diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr
@@ -50,9 +50,9 @@
                 <label for="quality"><%= translate(locale, "preferences_quality_label") %></label>
                 <select name="quality" id="quality">
                     <% {"hls", "dash", "hd720", "medium", "small"}.each do |option| %>
-                        <% if !(option == "dash" && CONFIG.disabled?("dash")) %>
-                            <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, "preferences_quality_option_" + option) %></option>
-                        <% end %>
+                        <% next if (option == "dash" && CONFIG.disabled?("dash"))%>
+                        <% next if (option == "hls" && CONFIG.disabled?("hls"))%>
+                        <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, "preferences_quality_option_" + option) %></option>
                     <% end %>
                 </select>
             </div>