Skip to content

fix: check expires_at when get grant public key #4036

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

Open
randomowo wants to merge 4 commits into
base: master
Choose a base branch
from
+31 −1
Open

fix: check expires_at when get grant public key #4036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0f1a23
fix: check expires_at when get grant public key
randomowo Oct 22, 2025
f19337e
test: add test for expired grant
randomowo Oct 22, 2025
1f84ce1
Merge branch 'master' into fix-expired-grant
randomowo Oct 25, 2025
4f36712
Merge branch 'master' into fix-expired-grant
randomowo Dec 6, 2025
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
25 changes: 25 additions & 0 deletions oauth2/fosite_store_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,31 @@ func testFositeJWTBearerGrantStorage(x *driver.RegistrySQL) func(t *testing.T) {
require.NotEmpty(t, jwks.Keys)
})

t.Run("case=does not found expired grant", func(t *testing.T) {
keySet, err := jwk.GenerateJWK(jose.RS256, uuid.Must(uuid.NewV4()).String(), "sig")
require.NoError(t, err)

publicKey := keySet.Keys[0].Public()
issuer := uuid.Must(uuid.NewV4()).String()
subject := uuid.Must(uuid.NewV4()).String()
grant := trust.Grant{
ID: uuid.Must(uuid.NewV4()),
Issuer: issuer,
Subject: subject,
AllowAnySubject: true,
Scope: []string{"openid", "offline"},
PublicKey: trust.PublicKey{Set: issuer, KeyID: publicKey.KeyID},
CreatedAt: time.Now().UTC().Round(time.Second),
ExpiresAt: time.Now().UTC().Round(time.Second).AddDate(-1, 0, 0),
}

require.NoError(t, grantManager.CreateGrant(ctx, grant, publicKey))

key, err := grantStorage.GetPublicKey(ctx, issuer, subject, publicKey.KeyID)
require.Error(t, err)
assert.Nil(t, key)
})

t.Run("case=does not return expired values", func(t *testing.T) {
keySet, err := jwk.GenerateJWK(jose.RS256, uuid.Must(uuid.NewV4()).String(), "sig")
require.NoError(t, err)
Expand Down
7 changes: 6 additions & 1 deletion persistence/sql/persister_grant_jwk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ func (p *Persister) GetPublicKey(ctx context.Context, issuer string, subject str
tableName += "@hydra_oauth2_trusted_jwt_bearer_issuer_nid_uq_idx"
}

sql := fmt.Sprintf(`SELECT key_set FROM %s WHERE key_id = ? AND nid = ? AND issuer = ? AND (subject = ? OR allow_any_subject IS TRUE) LIMIT 1`, tableName)
expiresAt := "expires_at > NOW()"
if p.Connection(ctx).Dialect.Name() == "sqlite3" {
expiresAt = "expires_at > datetime('now')"
}

sql := fmt.Sprintf(`SELECT key_set FROM %s WHERE key_id = ? AND nid = ? AND issuer = ? AND (subject = ? OR allow_any_subject IS TRUE) AND %s LIMIT 1`, tableName, expiresAt)
query := p.Connection(ctx).RawQuery(sql,
keyId, p.NetworkID(ctx), issuer, subject,
)
Expand Down
Loading