High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
fix(auth): fetch OIDC userinfo when email_verified is absent from the ID token (#3300)
Santhi Prakashe190cd3ae9aa
diff --git a/internal/auth/auth.go b/internal/auth/auth.goindex cecc0fea..54c0f12a 100644--- a/internal/auth/auth.go+++ b/internal/auth/auth.go@@ -309,8 +309,9 @@ func (o *Auth) ExchangeOIDCToken(code, nonce, codeVerifier string) (string, OIDCreturn "", OIDCclaim{}, errors.New("error getting raw claims from OIDC")}- // If claims doesn't have the e-mail, attempt to fetch it from the userinfo endpoint.- if claims.Email == "" {+ // If there's no e-mail verification claim (OIDC Core 5.1), or if there's no e-mail, fetch userinfo.+ _, hasEmailVerified := claims.RawClaims["email_verified"]+ if claims.Email == "" || !hasEmailVerified {provider, err := o.getProvider()if err != nil {return "", OIDCclaim{}, fmt.Errorf("error getting provider: %v", err)@@ -326,12 +327,16 @@ func (o *Auth) ExchangeOIDCToken(code, nonce, codeVerifier string) (string, OIDC}// Verification must apply to the email supplied by UserInfo.+ claims.Email = ""claims.EmailVerified = false// Parse the UserInfo claims into the claims structif err := userInfo.Claims(&claims); err != nil {return "", OIDCclaim{}, errors.New("error parsing user info claims")}+ if claims.Email == "" {+ return "", OIDCclaim{}, echo.NewHTTPError(http.StatusUnauthorized, "OIDC email is missing")+ }}if !claims.EmailVerified {