This commit is contained in:
Omar Roth 2018-04-29 09:40:33 -05:00
parent 1ea7290892
commit ae68213dc7
3 changed files with 50 additions and 9 deletions

View file

@ -617,11 +617,10 @@ def get_user(sid, client, headers, db)
end end
def fetch_user(sid, client, headers) def fetch_user(sid, client, headers)
feed = client.get("/subscription_manager?disable_polymer=1", headers).body feed = client.get("/subscription_manager?disable_polymer=1", headers)
feed = XML.parse_html(feed.body)
channels = [] of String channels = [] of String
feed = XML.parse_html(feed)
feed.xpath_nodes(%q(//a[@class="subscription-title yt-uix-sessionlink"]/@href)).each do |channel| feed.xpath_nodes(%q(//a[@class="subscription-title yt-uix-sessionlink"]/@href)).each do |channel|
channel_id = channel.content.lstrip("/channel/").not_nil! channel_id = channel.content.lstrip("/channel/").not_nil!
get_channel(channel_id, client, PG_DB) get_channel(channel_id, client, PG_DB)

View file

@ -53,7 +53,7 @@ Kemal.config.extra_options do |parser|
rescue ex rescue ex
puts "THREADS must be integer" puts "THREADS must be integer"
exit exit
end end
end end
end end
@ -421,6 +421,9 @@ get "/login" do |env|
referer = env.request.headers["referer"]? referer = env.request.headers["referer"]?
referer ||= "/feed/subscriptions" referer ||= "/feed/subscriptions"
tfa = env.params.query["tfa"]?
tfa ||= false
if referer.ends_with? "/login" if referer.ends_with? "/login"
referer = "/feed/subscriptions" referer = "/feed/subscriptions"
end end
@ -439,10 +442,14 @@ post "/login" do |env|
email = env.params.body["email"]? email = env.params.body["email"]?
password = env.params.body["password"]? password = env.params.body["password"]?
tfa_code = env.params.body["tfa"]?.try &.lchop("G-")
begin begin
client = make_client(LOGIN_URL) client = make_client(LOGIN_URL)
headers = HTTP::Headers.new headers = HTTP::Headers.new
headers["Content-Type"] = "application/x-www-form-urlencoded;charset=utf-8"
headers["Google-Accounts-XSRF"] = "1"
login_page = client.get("/ServiceLogin") login_page = client.get("/ServiceLogin")
headers = login_page.cookies.add_request_headers(headers) headers = login_page.cookies.add_request_headers(headers)
@ -471,10 +478,7 @@ post "/login" do |env|
end end
end end
lookup_req = %(["#{email}","#{inputs["session-state"]}",[],null,"US",null,null,2,false,true,[null,null,[2,1,null,1,"https://accounts.google.com/ServiceLogin?passive=true&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Fnext%3D%252F%26action_handle_signin%3Dtrue%26hl%3Den%26app%3Ddesktop%26feature%3Dsign_in_button&hl=en&service=youtube&uilel=3&requestPath=%2FServiceLogin&Page=PasswordSeparationSignIn",null,[],4,[]],1,[null,null,[]],null,null,null,true],"#{email}"]) lookup_req = %(["#{email}",null,[],null,"US",null,null,2,false,true,[null,null,[2,1,null,1,"https://accounts.google.com/ServiceLogin?passive=1209600&continue=https%3A%2F%2Faccounts.google.com%2FManageAccount&followup=https%3A%2F%2Faccounts.google.com%2FManageAccount",null,[],4,[]],1,[null,null,[]],null,null,null,true],"#{email}"])
headers["Content-Type"] = "application/x-www-form-urlencoded;charset=utf-8"
headers["Google-Accounts-XSRF"] = "1"
lookup_results = client.post("/_/signin/sl/lookup", headers, login_req(inputs, lookup_req)) lookup_results = client.post("/_/signin/sl/lookup", headers, login_req(inputs, lookup_req))
headers = lookup_results.cookies.add_request_headers(headers) headers = lookup_results.cookies.add_request_headers(headers)
@ -485,7 +489,7 @@ post "/login" do |env|
user_hash = lookup_results[0][2] user_hash = lookup_results[0][2]
challenge_req = %([#{user_hash},null,1,null,[1,null,null,null,[#{password},null,true]],[null,null,[2,1,null,1,"https://accounts.google.com/ServiceLogin?passive=true&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Fnext%3D%252F%26action_handle_signin%3Dtrue%26hl%3Den%26app%3Ddesktop%26feature%3Dsign_in_button&hl=en&service=youtube&uilel=3&requestPath=%2FServiceLogin&Page=PasswordSeparationSignIn", null,[],4],1,[null,null,[]],null,null,null,true]]) challenge_req = %(["#{user_hash}",null,1,null,[1,null,null,null,["#{password}",null,true]],[null,null,[2,1,null,1,"https://accounts.google.com/ServiceLogin?passive=1209600&continue=https%3A%2F%2Faccounts.google.com%2FManageAccount&followup=https%3A%2F%2Faccounts.google.com%2FManageAccount",null,[],4,[]],1,[null,null,[]],null,null,null,true]])
challenge_results = client.post("/_/signin/sl/challenge", headers, login_req(inputs, challenge_req)) challenge_results = client.post("/_/signin/sl/challenge", headers, login_req(inputs, challenge_req))
headers = challenge_results.cookies.add_request_headers(headers) headers = challenge_results.cookies.add_request_headers(headers)
@ -494,11 +498,44 @@ post "/login" do |env|
challenge_results = challenge_results[5..-1] challenge_results = challenge_results[5..-1]
challenge_results = JSON.parse(challenge_results) challenge_results = JSON.parse(challenge_results)
headers["Cookie"] = URI.unescape(headers["Cookie"])
if challenge_results[0][5]?.try &.[5] == "INCORRECT_ANSWER_ENTERED" if challenge_results[0][5]?.try &.[5] == "INCORRECT_ANSWER_ENTERED"
error_message = "Incorrect password" error_message = "Incorrect password"
next templated "error" next templated "error"
end end
if challenge_results[0][-1][0].as_a?
tfa = challenge_results[0][-1][0][0]
if tfa[2] == "TWO_STEP_VERIFICATION"
if tfa[5] == "QUOTA_EXCEEDED"
error_message = "Quota exceeded, try again in a few hours"
next templated "error"
end
if !tfa_code
next env.redirect "/login?tfa=true"
end
tl = challenge_results[1][2]
tfa_req = %(["#{user_hash}",null,2,null,[9,null,null,null,null,null,null,null,[null,"#{tfa_code}",false,2]]])
challenge_results = client.post("/_/signin/challenge?hl=en&TL=#{tl}", headers, login_req(inputs, tfa_req))
headers = challenge_results.cookies.add_request_headers(headers)
challenge_results = challenge_results.body
challenge_results = challenge_results[5..-1]
challenge_results = JSON.parse(challenge_results)
if challenge_results[0][5]?.try &.[5] == "INCORRECT_ANSWER_ENTERED"
error_message = "Invalid TFA code"
next templated "error"
end
end
end
login_res = challenge_results[0][13][2].to_s login_res = challenge_results[0][13][2].to_s
login = client.get(login_res, headers) login = client.get(login_res, headers)

View file

@ -15,6 +15,11 @@
<label for="password">Password</label> <label for="password">Password</label>
<input class="pure-input-1" name="password" type="password" placeholder="Password"> <input class="pure-input-1" name="password" type="password" placeholder="Password">
<% if tfa %>
<label for="tfa">Google verification code</label>
<input class="pure-input-1" name="tfa" type="text" placeholder="Google verification code">
<% end %>
<button type="submit" class="pure-button pure-button-primary">Sign in</button> <button type="submit" class="pure-button pure-button-primary">Sign in</button>
</fieldset> </fieldset>