public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split session enrichment from code redemption

This commit is contained in:
Nick Meves 2020-09-26 13:19:08 -07:00
parent 8b44ddd547
commit add45c360c
No known key found for this signature in database
GPG Key ID: 93BA8A3CEDCDD1CF
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
oauthproxy.go
View File

@ -357,22 +357,24 @@ func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (*sessio
if err != nil { if err != nil {
return nil, err return nil, err
} }
return s, nil
}
func (p *OAuthProxy) enrichSession(ctx context.Context, s *sessionsapi.SessionState) error {
var err error
if s.Email == "" { if s.Email == "" {
s.Email, err = p.provider.GetEmailAddress(ctx, s) s.Email, err = p.provider.GetEmailAddress(ctx, s)
if err != nil && err.Error() != "not implemented" { if err != nil && err.Error() != "not implemented" {
return nil, err return err
} }
} }
if s.User == "" { if s.User == "" {
s.User, err = p.provider.GetUserName(ctx, s) s.User, err = p.provider.GetUserName(ctx, s)
if err != nil && err.Error() != "not implemented" { if err != nil && err.Error() != "not implemented" {
return nil, err return err
} }
} }
return nil
return s, nil
} }
// MakeCSRFCookie creates a cookie for CSRF // MakeCSRFCookie creates a cookie for CSRF
@ -829,14 +831,21 @@ func (p *OAuthProxy) OAuthCallback(rw http.ResponseWriter, req *http.Request) {
return return
} }
s := strings.SplitN(req.Form.Get("state"), ":", 2) err = p.enrichSession(req.Context(), session)
if len(s) != 2 { if err != nil {
logger.Errorf("Error creating session during OAuth2 callback: %v", err)
p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Internal Error")
return
}
state := strings.SplitN(req.Form.Get("state"), ":", 2)
if len(state) != 2 {
logger.Error("Error while parsing OAuth2 state: invalid length") logger.Error("Error while parsing OAuth2 state: invalid length")
p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Invalid State") p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Invalid State")
return return
} }
nonce := s[0] nonce := state[0]
redirect := s[1] redirect := state[1]
c, err := req.Cookie(p.CSRFCookieName) c, err := req.Cookie(p.CSRFCookieName)
if err != nil { if err != nil {
logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: unable to obtain CSRF cookie") logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: unable to obtain CSRF cookie")