TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-23 11:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(oidc): ignore invalid id_token_hints (#10682)

Browse Source 
# Which Problems Are Solved

Invalid id_tokens used as `id_token_hint` on the authorization endpoints
currently return an error, resp. get display on the endpoint itself.

# How the Problems Are Solved

Ignore invalid id_token_hint errors and just log them.

# Additional Changes

None

# Additional Context

- closes https://github.com/zitadel/zitadel/issues/10673
- backport to v4.x
This commit is contained in:
Livio Spring
2025-09-10 08:25:25 +02:00
committed by GitHub
parent 492f1826ee
commit e158f9447e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/api/oidc/server.go
View File

@@ -140,9 +140,19 @@ func (s *Server) VerifyAuthRequest(ctx context.Context, r *op.Request[oidc.AuthR
func (s *Server) Authorize(ctx context.Context, r *op.ClientRequest[oidc.AuthRequest]) (_ *op.Redirect, err error) { func (s *Server) Authorize(ctx context.Context, r *op.ClientRequest[oidc.AuthRequest]) (_ *op.Redirect, err error) {
ctx, span := tracing.NewSpan(ctx) ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }() defer span.End()
return s.LegacyServer.Authorize(ctx, r) // Use an own method to validate the id_token_hint, because in case of an error, we don't want to fail the request.
// We just want to ignore the hint.
userID, err := op.ValidateAuthReqIDTokenHint(ctx, r.Data.IDTokenHint, s.Provider().IDTokenHintVerifier(ctx))
logging.WithFields("instanceID", authz.GetInstance(ctx).InstanceID()).
OnError(err).Error("invalid id_token_hint")
req, err := s.Provider().Storage().CreateAuthRequest(ctx, r.Data, userID)
if err != nil {
return op.TryErrorRedirect(ctx, r.Data, oidc.DefaultToServerError(err, "unable to save auth request"), s.Provider().Encoder(), s.Provider().Logger())
}
return op.NewRedirect(r.Client.LoginURL(req.GetID())), nil
} }
func (s *Server) DeviceAuthorization(ctx context.Context, r *op.ClientRequest[oidc.DeviceAuthorizationRequest]) (_ *op.Response, err error) { func (s *Server) DeviceAuthorization(ctx context.Context, r *op.ClientRequest[oidc.DeviceAuthorizationRequest]) (_ *op.Response, err error) {