Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RFC: Enable github two-factor authentication; fixes #5252 #6668

Merged
merged 2 commits into from
Sep 4, 2014
Merged

RFC: Enable github two-factor authentication; fixes #5252 #6668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b1f30
Enable github two-factor authentication; fixes #5252
kmsquire Apr 27, 2014
e5eaf80
Updates to two-factor authentication.
kmsquire Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 34 additions & 7 deletions base/pkg/github.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ function curl(url::String, opts::Cmd=``)
out, proc = open(`curl -i -s -S $opts $url`,"r")
head = readline(out)
status = int(split(head,r"\s+";limit=3)[2])
header = (String=>String)[]
for line in eachline(out)
ismatch(r"^\s*$",line) || continue
wait(proc); return status, readall(out)
if !ismatch(r"^\s*$",line)
(k,v) = split(line, r":\s*", 2)
header[k] = v
continue
end
wait(proc); return status, header, readall(out)
end
error("strangely formatted HTTP response")
end
Expand All @@ -55,33 +60,55 @@ end
function token(user::String=user())
tokfile = Dir.path(".github","token")
isfile(tokfile) && return strip(readchomp(tokfile))
status, content = curl("https://api.github.com/authorizations",AUTH_DATA,`-u $user`)
status, header, content = curl("https://api.github.com/authorizations",AUTH_DATA,`-u $user`)
tfa = false

# Check for two-factor authentication
if status == 401 && get(header, "X-GitHub-OTP", "") |> x->beginswith(x, "required") && isinteractive()
tfa = true
info("Two-factor authentication in use. Enter auth code. (You may have to re-enter your password.)")
print(STDERR, "Authentication code: ")
code = readline(STDIN) |> chomp
status, header, content = curl("https://api.github.com/authorizations",AUTH_DATA,`-H "X-GitHub-OTP: $code" -u $user`)
end

if status == 422
error_code = json().parse(content)["errors"][1]["code"]
if error_code == "already_exists"
info("Retrieving existing GitHub token (you may have to enter you password again)")
status,content = curl("https://api.github.com/authorizations",`-u $user`)
if tfa
info("Retrieving existing GitHub token. (You may have to re-enter your password twice more.)")
status, header, content = curl("https://api.github.com/authorizations",AUTH_DATA,`-u $user`)
status != 401 && error("$status: $(json().parse(content)["message"])")
print(STDERR, "New authentication code: ")
code = readline(STDIN) |> chomp
status, header, content = curl("https://api.github.com/authorizations",`-H "X-GitHub-OTP: $code" -u $user`)
else
info("Retrieving existing GitHub token. (You may have to re-enter your password.)")
status, header, content = curl("https://api.github.com/authorizations", `-u $user`)
end
(status >= 400) && error("$status: $(json().parse(content)["message"])")
for entry in json().parse(content)
if entry["note"] == AUTH_NOTE
tok = entry["token"]
break
end
end
else
error("GitHub returned validation error (422): $error_code")
error("GitHub returned validation error (422): $error_code: $(json().parse(content)["message"])")
end
else
(status != 401 && status != 403) || error("$status: $(json().parse(content)["message"])")
tok = json().parse(content)["token"]
end

mkpath(dirname(tokfile))
open(io->println(io,tok),tokfile,"w")
return tok
end

function req(resource::String, data, opts::Cmd=``)
url = "https://api.github.com/$resource"
status, content = curl(url,data,`-u $(token()):x-oauth-basic $opts`)
status, header, content = curl(url,data,`-u $(token()):x-oauth-basic $opts`)
response = json().parse(content)
status, response
end
Expand Down