|
|
@ -1390,8 +1390,7 @@ get "/login" do |env|
|
|
|
|
captcha_type ||= "image"
|
|
|
|
captcha_type ||= "image"
|
|
|
|
|
|
|
|
|
|
|
|
tfa = env.params.query["tfa"]?
|
|
|
|
tfa = env.params.query["tfa"]?
|
|
|
|
tfa ||= false
|
|
|
|
prompt = nil
|
|
|
|
prompt = ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
templated "login"
|
|
|
|
templated "login"
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -1444,7 +1443,7 @@ post "/login" do |env|
|
|
|
|
|
|
|
|
|
|
|
|
headers["Content-Type"] = "application/x-www-form-urlencoded;charset=utf-8"
|
|
|
|
headers["Content-Type"] = "application/x-www-form-urlencoded;charset=utf-8"
|
|
|
|
headers["Google-Accounts-XSRF"] = "1"
|
|
|
|
headers["Google-Accounts-XSRF"] = "1"
|
|
|
|
headers["User-Agent"] = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36"
|
|
|
|
headers["User-Agent"] = random_user_agent
|
|
|
|
|
|
|
|
|
|
|
|
response = client.post("/_/signin/sl/lookup", headers, login_req(lookup_req))
|
|
|
|
response = client.post("/_/signin/sl/lookup", headers, login_req(lookup_req))
|
|
|
|
lookup_results = JSON.parse(response.body[5..-1])
|
|
|
|
lookup_results = JSON.parse(response.body[5..-1])
|
|
|
@ -1453,10 +1452,17 @@ post "/login" do |env|
|
|
|
|
|
|
|
|
|
|
|
|
user_hash = lookup_results[0][2]
|
|
|
|
user_hash = lookup_results[0][2]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if token = env.params.body["token"]?
|
|
|
|
|
|
|
|
answer = env.params.body["answer"]?
|
|
|
|
|
|
|
|
captcha = {token, answer}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
captcha = nil
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
challenge_req = {
|
|
|
|
challenge_req = {
|
|
|
|
user_hash, nil, 1, nil,
|
|
|
|
user_hash, nil, 1, nil,
|
|
|
|
{1, nil, nil, nil,
|
|
|
|
{1, nil, nil, nil,
|
|
|
|
{password, nil, true},
|
|
|
|
{password, captcha, true},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{nil, nil,
|
|
|
|
{nil, nil,
|
|
|
|
{2, 1, nil, 1,
|
|
|
|
{2, 1, nil, 1,
|
|
|
@ -1484,11 +1490,14 @@ post "/login" do |env|
|
|
|
|
next templated "error"
|
|
|
|
next templated "error"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
# TODO: Handle Google's CAPTCHA
|
|
|
|
if token = challenge_results[0][-1]?.try &.[-1]?.try &.as_h?.try &.["5001"]?.try &.[-1].as_a?.try &.[-1].as_s
|
|
|
|
if captcha = challenge_results[0][-1]?.try &.[-1]?.try &.as_h?.try &.["5001"]?.try &.[-1].as_a?
|
|
|
|
account_type = "google"
|
|
|
|
error_message = "Unhandled CAPTCHA. Please try again later."
|
|
|
|
captcha_type = "image"
|
|
|
|
env.response.status_code = 401
|
|
|
|
prompt = nil
|
|
|
|
next templated "error"
|
|
|
|
tfa = tfa_code
|
|
|
|
|
|
|
|
captcha = {tokens: [token], question: ""}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
next templated "login"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if challenge_results[0][-1]?.try &.[5] == "INCORRECT_ANSWER_ENTERED"
|
|
|
|
if challenge_results[0][-1]?.try &.[5] == "INCORRECT_ANSWER_ENTERED"
|
|
|
@ -1547,7 +1556,7 @@ post "/login" do |env|
|
|
|
|
prompt = "Google verification code"
|
|
|
|
prompt = "Google verification code"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
tfa = true
|
|
|
|
tfa = nil
|
|
|
|
captcha = nil
|
|
|
|
captcha = nil
|
|
|
|
next templated "login"
|
|
|
|
next templated "login"
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -5770,6 +5779,13 @@ get "/vi/:id/:name" do |env|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get "/Captcha" do |env|
|
|
|
|
|
|
|
|
client = make_client(LOGIN_URL)
|
|
|
|
|
|
|
|
response = client.get(env.request.resource)
|
|
|
|
|
|
|
|
env.response.headers["Content-Type"] = response.headers["Content-Type"]
|
|
|
|
|
|
|
|
response.body
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
# Undocumented, creates anonymous playlist with specified 'video_ids', max 50 videos
|
|
|
|
# Undocumented, creates anonymous playlist with specified 'video_ids', max 50 videos
|
|
|
|
get "/watch_videos" do |env|
|
|
|
|
get "/watch_videos" do |env|
|
|
|
|
response = YT_POOL.client &.get(env.request.resource)
|
|
|
|
response = YT_POOL.client &.get(env.request.resource)
|
|
|
|