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

Allow 'host' header to be optional

Browse source
This commit is contained in:
Omar Roth 2018-08-05 14:37:32 -05:00
parent d51b23bc16
commit a29458e32f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/invidious.cr
View file

@ -216,7 +216,7 @@ get "/watch" do |env|
video.description = add_alt_links(video.description) video.description = add_alt_links(video.description)
description = video.short_description description = video.short_description
host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]?)
host_params = env.request.query_params host_params = env.request.query_params
host_params.delete_all("v") host_params.delete_all("v")
@ -306,7 +306,7 @@ get "/embed/:id" do |env|
video.description = add_alt_links(video.description) video.description = add_alt_links(video.description)
description = video.short_description description = video.short_description
host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]?)
host_params = env.request.query_params host_params = env.request.query_params
host_params.delete_all("v") host_params.delete_all("v")
@ -847,7 +847,7 @@ get "/subscription_manager" do |env|
subscriptions.sort_by! { |channel| channel.author.downcase } subscriptions.sort_by! { |channel| channel.author.downcase }
if action_takeout if action_takeout
host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]?)
if format == "json" if format == "json"
env.response.content_type = "application/json" env.response.content_type = "application/json"
@ -1259,7 +1259,7 @@ get "/feed/channel/:ucid" do |env|
content_html = json["content_html"].as_s content_html = json["content_html"].as_s
document = XML.parse_html(content_html) document = XML.parse_html(content_html)
host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]?)
path = env.request.path path = env.request.path
feed = XML.build(indent: " ", encoding: "UTF-8") do |xml| feed = XML.build(indent: " ", encoding: "UTF-8") do |xml|
@ -1416,7 +1416,7 @@ get "/feed/private" do |env|
videos = videos[0..max_results] videos = videos[0..max_results]
end end
host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]?)
path = env.request.path path = env.request.path
query = env.request.query.not_nil! query = env.request.query.not_nil!

2
src/invidious/helpers/utils.cr
View file

@ -135,5 +135,7 @@ def make_host_url(ssl, host)
scheme = "http://" scheme = "http://"
end end
host ||= "invidio.us"
return "#{scheme}#{host}" return "#{scheme}#{host}"
end end