mirror of
				https://github.com/iv-org/invidious.git
				synced 2025-05-31 14:11:54 +05:30 
			
		
		
		
	Fix HTTP redirect
This commit is contained in:
		@@ -5,5 +5,4 @@ db:
 | 
			
		||||
  password: kemal
 | 
			
		||||
  host: localhost
 | 
			
		||||
  port: 5432
 | 
			
		||||
  dbname: invidious
 | 
			
		||||
redirect: false
 | 
			
		||||
  dbname: invidious
 | 
			
		||||
@@ -24,7 +24,6 @@ class Config
 | 
			
		||||
      port: Int32,
 | 
			
		||||
      dbname: String,
 | 
			
		||||
    ),
 | 
			
		||||
    redirect:   Bool,
 | 
			
		||||
    dl_api_key: String?,
 | 
			
		||||
  })
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,6 @@ CONFIG = Config.from_yaml(File.read("config/config.yml"))
 | 
			
		||||
 | 
			
		||||
pool_size = CONFIG.pool_size
 | 
			
		||||
threads = CONFIG.threads
 | 
			
		||||
redirect = CONFIG.redirect
 | 
			
		||||
 | 
			
		||||
Kemal.config.extra_options do |parser|
 | 
			
		||||
  parser.banner = "Usage: invidious [arguments]"
 | 
			
		||||
@@ -47,16 +46,6 @@ Kemal.config.extra_options do |parser|
 | 
			
		||||
      exit
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
  parser.on("-r REDIRECT", "--redirect=BOOL", "Whether insecure requests should be forced to HTTPS, requires -s (default #{redirect})") do |boolean|
 | 
			
		||||
    if boolean == "true"
 | 
			
		||||
      redirect = true
 | 
			
		||||
    elsif boolean == "false"
 | 
			
		||||
      redirect = false
 | 
			
		||||
    else
 | 
			
		||||
      puts "REDIRECT must be 'true' or 'false'"
 | 
			
		||||
      exit
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
Kemal::CLI.new
 | 
			
		||||
@@ -537,8 +526,8 @@ error 500 do |env|
 | 
			
		||||
  templated "error"
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
# Add redirect if SSL is enabled and redirect is enabled
 | 
			
		||||
if Kemal.config.ssl && redirect
 | 
			
		||||
# Add redirect if SSL is enabled
 | 
			
		||||
if Kemal.config.ssl
 | 
			
		||||
  spawn do
 | 
			
		||||
    server = HTTP::Server.new("0.0.0.0", 80) do |context|
 | 
			
		||||
      redirect_url = "https://#{context.request.host}#{context.request.path}"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user