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

OAuth: Handle errors in redirect when passed by GitHub #10119

Merged
merged 1 commit into from
Nov 9, 2018
Merged

OAuth: Handle errors in redirect when passed by GitHub #10119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion prow/githuboauth/githuboauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,19 @@ func (ga *GithubOAuthAgent) HandleRedirect(client OAuthClient, getter GithubClie
code := r.FormValue("code")
token, err := client.Exchange(context.Background(), code)
if err != nil {
ga.serverError(w, "Exchange code for token", err)
if gherror := r.FormValue("error"); len(gherror) > 0 {
gherrorDescription := r.FormValue("error_description")
gherrorURI := r.FormValue("error_uri")
fields := logrus.Fields{
"gh_error": gherror,
"gh_error_description": gherrorDescription,
"gh_error_uri": gherrorURI,
}
ga.logger.WithFields(fields).Error("GitHub passed errors in callback, token is not present")
ga.serverError(w, "OAuth authentication with GitHub", fmt.Errorf(gherror))
} else {
ga.serverError(w, "Exchange code for token", err)
}
return
}

Expand Down