From 15046fc2e56f8a582c03b7215f8ad3890f99fe1c Mon Sep 17 00:00:00 2001 From: Oscar Sanderson Date: Thu, 19 Nov 2026 11:05:02 +0800 Subject: [PATCH 1/2] fix(sqlstore): read a keyed grant listing by its primary key FAPIgo v0.77.0 passes GrantListing.Key when it confirms a refresh token's grant, so the check needn't list the subject's other grants. sqlstore ignored Key, so each refresh-token issuance still fetched and decrypted every unexpired grant of the subject, a cost that grows with each completed authorization. ListGrants now reads only the entry with that key, still scoped to the subject and to unexpired entries, and answers a key it can't store as unknown. sqlstore now requires fapigo v0.77.0. Co-Authored-By: Claude Opus 5.5 --- sqlstore/contract_test.go | 20 ++++++++++++++++++++ sqlstore/db_test.go | 3 +++ sqlstore/go.mod | 2 +- sqlstore/grant_registry.go | 13 +++++++++---- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sqlstore/contract_test.go b/sqlstore/contract_test.go index b1c3d2b5..92795928 100644 --- a/sqlstore/contract_test.go +++ b/sqlstore/contract_test.go @@ -3,6 +3,7 @@ package sqlstore_test import ( "context" "testing" + "time" "github.com/idfoundry/fapigo/sqlstore" "github.com/idfoundry/fapigo/storage" @@ -84,6 +85,25 @@ func TestGrantRegistryContract(t *testing.T) { }) } +// TestGrantRegistryListsByKeyAlone checks that a keyed listing reads +// only that entry, not the subject's other grants with it. +func TestGrantRegistryListsByKeyAlone(t *testing.T) { + forEachDialect(t, func(t *testing.T, dialect sqlstore.Dialect) { + r := freshDB(t, dialect).GrantRegistry() + ctx := context.Background() + expires := time.Now().Add(time.Hour) + for _, key := range []string{"g1", "g2"} { + if err := r.RecordGrant(ctx, storage.NewGrantEntry{Key: key, SubjectKey: "s1", ClientID: "c", Record: []byte(`{}`), ExpiresAt: expires}); err != nil { + t.Fatal(err) + } + } + entries, err := r.ListGrants(ctx, storage.GrantListing{SubjectKey: "s1", Now: time.Now(), Key: "g1"}) + if err != nil || len(entries) != 1 || entries[0].Key != "g1" { + t.Fatalf("ListGrants(s1, key g1) = %+v, %v, want g1 alone", entries, err) + } + }) +} + func TestBackchannelInboxContract(t *testing.T) { forEachDialect(t, func(t *testing.T, dialect sqlstore.Dialect) { storage.TestBackchannelInboxContract(t, func() storage.BackchannelInbox { return freshDB(t, dialect).BackchannelInbox() }) diff --git a/sqlstore/db_test.go b/sqlstore/db_test.go index d0c71e79..28b37461 100644 --- a/sqlstore/db_test.go +++ b/sqlstore/db_test.go @@ -648,6 +648,9 @@ func checkUnstorableKeyReads(t *testing.T, d *sqlstore.DB, key string) { if got, err := d.GrantRegistry().ListGrants(ctx, storage.GrantListing{SubjectKey: key, Now: time.Now()}); err != nil || len(got) != 0 { t.Errorf("ListGrants(%q) = %v, %v, want none", key, got, err) } + if got, err := d.GrantRegistry().ListGrants(ctx, storage.GrantListing{SubjectKey: "s", Key: key, Now: time.Now()}); err != nil || len(got) != 0 { + t.Errorf("ListGrants(Key: %q) = %v, %v, want none", key, got, err) + } if got, err := d.BackchannelInbox().ListBackchannelRequests(ctx, storage.BackchannelInboxListing{SubjectKey: key, Now: time.Now()}); err != nil || len(got) != 0 { t.Errorf("ListBackchannelRequests(%q) = %v, %v, want none", key, got, err) } diff --git a/sqlstore/go.mod b/sqlstore/go.mod index db9d0863..1d3e4778 100644 --- a/sqlstore/go.mod +++ b/sqlstore/go.mod @@ -3,7 +3,7 @@ module github.com/idfoundry/fapigo/sqlstore go 1.26.11 require ( - github.com/idfoundry/fapigo v0.74.0 + github.com/idfoundry/fapigo v0.77.0 github.com/jackc/pgx/v5 v5.12.0 modernc.org/sqlite v1.62.0 ) diff --git a/sqlstore/grant_registry.go b/sqlstore/grant_registry.go index d2aa0406..29050a36 100644 --- a/sqlstore/grant_registry.go +++ b/sqlstore/grant_registry.go @@ -47,13 +47,18 @@ func (r grantRegistry) RecordGrant(ctx context.Context, entry storage.NewGrantEn return nil } -// ListGrants implements storage.GrantRegistry: one indexed read. +// ListGrants implements storage.GrantRegistry: one indexed read. With +// listing.Key set it reads only that entry, by its primary key, so the +// read doesn't grow with the subject's other grants. func (r grantRegistry) ListGrants(ctx context.Context, listing storage.GrantListing) ([]storage.GrantEntry, error) { - if !validTextKey(listing.SubjectKey) { + if !validTextKey(listing.SubjectKey) || (listing.Key != "" && !validTextKey(listing.Key)) { return nil, nil } - rows, err := r.d.db.QueryContext(ctx, r.d.q("SELECT entry_key, client_id, record, expires_at FROM {grant_registry} WHERE subject_key = ? AND expires_at > ?"), // NOSONAR: go:S2077 — a constant query of this package's; q substitutes only the validated TablePrefix and placeholders. - listing.SubjectKey, nanos(listing.Now)) + query, args := "SELECT entry_key, client_id, record, expires_at FROM {grant_registry} WHERE subject_key = ? AND expires_at > ?", []any{listing.SubjectKey, nanos(listing.Now)} + if listing.Key != "" { + query, args = "SELECT entry_key, client_id, record, expires_at FROM {grant_registry} WHERE entry_key = ? AND subject_key = ? AND expires_at > ?", []any{listing.Key, listing.SubjectKey, nanos(listing.Now)} + } + rows, err := r.d.db.QueryContext(ctx, r.d.q(query), args...) // NOSONAR: go:S2077 — one of two constant queries of this package's; q substitutes only the validated TablePrefix and placeholders. if err != nil { return nil, unavailable(opListGrants, err) } From e64c57c2dab6664493ef997ebacde200bc231a0e Mon Sep 17 00:00:00 2001 From: Oscar Sanderson Date: Thu, 19 Nov 2026 11:14:44 +0800 Subject: [PATCH 2/2] chore(examples): require fapigo v0.77.0 in linked-accounts The sqlstore module it replaces locally now requires fapigo v0.77.0. Co-Authored-By: Claude Opus 5.5 --- examples/linked-accounts/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/linked-accounts/go.mod b/examples/linked-accounts/go.mod index cceb1f65..24298c5e 100644 --- a/examples/linked-accounts/go.mod +++ b/examples/linked-accounts/go.mod @@ -3,7 +3,7 @@ module github.com/idfoundry/fapigo/examples/linked-accounts go 1.26.11 require ( - github.com/idfoundry/fapigo v0.74.0 + github.com/idfoundry/fapigo v0.77.0 github.com/idfoundry/fapigo/examples/internal/demokit v0.0.0-00010101000000-000000000000 github.com/idfoundry/fapigo/sqlstore v0.0.0-00010101000000-000000000000 modernc.org/sqlite v1.62.0