hashirama/invidious-mod-JP
1
0
Fork 0
Code Issues Pull requests Actions 2 Projects Releases Wiki Activity

Add fix for Google cookies with no extension

Browse source
This commit is contained in:
Omar Roth 2019-03-20 09:48:37 -05:00
parent 88e6b865d9
commit f1d7aa09e4
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/invidious.cr
View file

@ -880,7 +880,7 @@ post "/login" do |env|
# Prefer Authenticator app and SMS over unsupported protocols # Prefer Authenticator app and SMS over unsupported protocols
if challenge_results[0][-1][0][0][8] != 6 && challenge_results[0][-1][0][0][8] != 9 if challenge_results[0][-1][0][0][8] != 6 && challenge_results[0][-1][0][0][8] != 9
tfa = challenge_results[0][-1][0].as_a.select { |auth_type| auth_type[8] == 6 || auth_type[8] == 9 }[0] tfa = challenge_results[0][-1][0].as_a.select { |auth_type| auth_type[8] == 6 || auth_type[8] == 9 }[0]
select_challenge = "[2,null,null,null,[#{tfa[8]}]]" select_challenge = {2, nil, nil, nil, {tfa[8]}}.to_json
tl = challenge_results[1][2] tl = challenge_results[1][2]
@ -940,11 +940,10 @@ post "/login" do |env|
headers = login.cookies.add_request_headers(headers) headers = login.cookies.add_request_headers(headers)
login = client.get(login.headers["Location"], headers) login = client.get(login.headers["Location"], headers)
headers = HTTP::Headers.new
headers = login.cookies.add_request_headers(headers) headers = login.cookies.add_request_headers(headers)
cookies = HTTP::Cookies.from_headers(headers)
sid = login.cookies["SID"].value sid = cookies["SID"].value
user, sid = get_user(sid, headers, PG_DB) user, sid = get_user(sid, headers, PG_DB)
@ -958,15 +957,17 @@ post "/login" do |env|
secure = false secure = false
end end
login.cookies.each do |cookie| cookies.each do |cookie|
if Kemal.config.ssl || config.https_only if Kemal.config.ssl || config.https_only
cookie.secure = secure cookie.secure = secure
else else
cookie.secure = secure cookie.secure = secure
end end
if cookie.extension
cookie.extension = cookie.extension.not_nil!.gsub(".youtube.com", host) cookie.extension = cookie.extension.not_nil!.gsub(".youtube.com", host)
cookie.extension = cookie.extension.not_nil!.gsub("Secure; ", "") cookie.extension = cookie.extension.not_nil!.gsub("Secure; ", "")
end
env.response.cookies << cookie env.response.cookies << cookie
end end