Skip to content

[1.0.x → main] [main -> 1.0.x] Backport OAuth fixes (#5119) #5121

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

Closed
thunder-automation-bot wants to merge 3 commits into from
Closed

[1.0.x → main] [main -> 1.0.x] Backport OAuth fixes (#5119) #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1824d2
Restrict introspect to access and refresh tokens
thiva-k Aug 15, 2026
e1a0f80
Bind CIBA-issued access tokens to the DPoP proof key
thiva-k Aug 15, 2026
9d6d443
Require id_token_hint to be an ID token
thiva-k Aug 15, 2026
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
4 changes: 4 additions & 0 deletions backend/internal/oauth/oauth2/granthandlers/ciba.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,15 @@ func (h *cibaGrantHandler) issueTokens(ctx context.Context, record *ciba.CIBAAut
OAuthApp: oauthApp,
ValidityPeriod: userSubConfig.ValidityPeriodOrZero(),
DPoPJkt: dpop.GetJkt(ctx),
<<<<<<< HEAD
}
if oauthApp.ShouldAppendActorClaim() {
accessTokenCtx.ActorClaims = &tokenservice.SubjectTokenClaims{Sub: oauthApp.ID}
}
accessToken, err := h.tokenBuilder.BuildAccessToken(ctx, accessTokenCtx)
=======
})
>>>>>>> 6e54c09ea (Bind CIBA-issued access tokens to the DPoP proof key)
if err != nil {
h.logger.Error(ctx, "Failed to generate access token", log.Error(err))
return nil, &model.ErrorResponse{
Expand Down
6 changes: 6 additions & 0 deletions backend/internal/oauth/oauth2/tokenservice/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,14 @@ type TokenValidatorInterface interface {
// refresh token into an ID-JAG.
ValidateIDJAGSubjectToken(ctx context.Context, token string, oauthApp *providers.OAuthClient) (
*SubjectTokenClaims, error)
<<<<<<< HEAD
// ValidateIDJAGAssertion validates an ID-JAG assertion presented on the jwt-bearer grant.
ValidateIDJAGAssertion(ctx context.Context, assertion string) (*IDJAGAssertionClaims, error)
=======
// ValidateIDJAGAssertion validates an ID-JAG assertion presented on the jwt-bearer grant,
// binding it to the authenticated client via its client_id claim.
ValidateIDJAGAssertion(ctx context.Context, assertion, clientID string) (*IDJAGAssertionClaims, error)
>>>>>>> abe9097b8 (Restrict introspect to access and refresh tokens)
}

// TokenValidator implements TokenValidatorInterface.
Expand Down
Loading