jan/hydra_oidc_poc
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add logger to oidc_callback

Browse source
This commit is contained in:
Jan Dittberner 2021-01-01 15:43:07 +01:00
parent 7947eaf862
commit c3117c8abe
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/handlers/oidc_callback.go
View file

@ -22,6 +22,7 @@ const (
type oidcCallbackHandler struct { type oidcCallbackHandler struct {
keySet *jwk.Set keySet *jwk.Set
logger *log.Logger
oauth2Config *oauth2.Config oauth2Config *oauth2.Config
} }
@ -38,7 +39,7 @@ func (c *oidcCallbackHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
errorText := r.URL.Query().Get("error") errorText := r.URL.Query().Get("error")
errorDescription := r.URL.Query().Get("error_description") errorDescription := r.URL.Query().Get("error_description")
if errorText != "" { if errorText != "" {
c.RenderErrorTemplate(w, r, errorText, errorDescription) c.RenderErrorTemplate(w, errorText, errorDescription, http.StatusForbidden)
return return
} }
@ -50,7 +51,7 @@ func (c *oidcCallbackHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
tok, err := c.oauth2Config.Exchange(ctx, code) tok, err := c.oauth2Config.Exchange(ctx, code)
if err != nil { if err != nil {
log.Error(err) c.logger.Error(err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
@ -68,11 +69,11 @@ func (c *oidcCallbackHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
session.Values[sessionKeyIdToken] = idToken session.Values[sessionKeyIdToken] = idToken
if oidcToken, err := ParseIdToken(idToken, c.keySet); err != nil { if oidcToken, err := ParseIdToken(idToken, c.keySet); err != nil {
log.Error(err) c.logger.Error(err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} else { } else {
log.Infof(` c.logger.Debugf(`
ID Token ID Token
======== ========
@ -105,17 +106,18 @@ Not valid after: %s
w.WriteHeader(http.StatusFound) w.WriteHeader(http.StatusFound)
} }
func (c *oidcCallbackHandler) RenderErrorTemplate(w http.ResponseWriter, r *http.Request, errorText string, errorDescription string) { func (c *oidcCallbackHandler) RenderErrorTemplate(w http.ResponseWriter, errorText string, errorDescription string, status int) {
if errorDescription != "" { if errorDescription != "" {
http.Error(w, errorDescription, http.StatusForbidden) http.Error(w, errorDescription, status)
} else { } else {
http.Error(w, errorText, http.StatusForbidden) http.Error(w, errorText, status)
} }
} }
func NewCallbackHandler(ctx context.Context) *oidcCallbackHandler { func NewCallbackHandler(ctx context.Context, logger *log.Logger) *oidcCallbackHandler {
return &oidcCallbackHandler{ return &oidcCallbackHandler{
keySet: commonServices.GetJwkSet(ctx), keySet: commonServices.GetJwkSet(ctx),
logger: logger,
oauth2Config: commonServices.GetOAuth2Config(ctx), oauth2Config: commonServices.GetOAuth2Config(ctx),
} }
} }