Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion pkg/op/token_exchange.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,11 @@ func GetTokenIDAndSubjectFromToken(
if !ok {
break
}
claims = accessTokenClaims.Claims
// opaque access tokens carry no JWT claims, so accessTokenClaims can be
// nil even when ok is true. Leave claims empty instead of dereferencing.
if accessTokenClaims != nil {
claims = accessTokenClaims.Claims
}
case oidc.RefreshTokenType:
refreshTokenRequest, err := exchanger.Storage().TokenRequestByRefreshToken(ctx, token)
if err != nil {
Expand Down
35 changes: 35 additions & 0 deletions pkg/op/token_exchange_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package op_test

import (
"context"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v3/pkg/op"
)

func TestGetTokenIDAndSubjectFromToken_OpaqueAccessToken(t *testing.T) {
ctx := context.Background()

// Opaque access tokens are stored as the encrypted string "tokenID:subject"
// and have no JWT claims attached. This used to panic because the returned
// claims pointer was dereferenced unconditionally.
token, err := testProvider.Crypto().Encrypt("tokenID:subject")
require.NoError(t, err)

var (
tokenIDOrToken, subject string
claims map[string]any
ok bool
)
require.NotPanics(t, func() {
tokenIDOrToken, subject, claims, ok = op.GetTokenIDAndSubjectFromToken(ctx, testProvider, token, oidc.AccessTokenType, false)
})

assert.True(t, ok)
assert.Equal(t, "tokenID", tokenIDOrToken)
assert.Equal(t, "subject", subject)
assert.Empty(t, claims)
}
Loading