Skip to content

Commit 5c27a94

Browse files
committed
improve secondary auth claims utilization
1 parent a9e4a8e commit 5c27a94

File tree

6 files changed

+35
-100
lines changed

6 files changed

+35
-100
lines changed

datastore/scopes/tenancy.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ func TenancyPartition(ctx context.Context) func(db *gorm.DB) *gorm.DB {
1818

1919
skipTenancyChecksOnClaims := security.IsTenancyChecksOnClaimSkipped(ctx)
2020
if skipTenancyChecksOnClaims {
21-
return db
21+
22+
authClaim = security.SecondaryClaimsFromContext(ctx)
23+
if authClaim == nil {
24+
return db
25+
}
2226
}
2327

2428
// Safely retrieve the table name (fallback to empty string if nil)

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
)
5050

5151
require (
52-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20251209175733-2a1774d88802.1 // indirect
52+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 // indirect
5353
cel.dev/expr v0.25.1 // indirect
5454
dario.cat/mergo v1.0.2 // indirect
5555
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
@@ -139,7 +139,7 @@ require (
139139
golang.org/x/sys v0.39.0 // indirect
140140
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
141141
google.golang.org/api v0.257.0 // indirect
142-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
144144
gopkg.in/yaml.v3 v3.0.1 // indirect
145145
)

0 commit comments

Comments
 (0)