Skip to content

Commit 57c2a45

Browse files
authored
1 parent 5e21468 commit 57c2a45

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

service/internal/auth/authn.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ type authContext struct {
3939
var (
4040
// Set of allowed public endpoints that do not require authentication
4141
allowedPublicEndpoints = [...]string{
42-
"/grpc.health.v1.Health/Check",
42+
// Well Known Configuration Endpoints
4343
"/wellknownconfiguration.WellKnownService/GetWellKnownConfiguration",
44-
"/kas.AccessService/PublicKey",
45-
"/healthz",
4644
"/.well-known/opentdf-configuration",
45+
// KAS Public Key Endpoints
46+
"/kas.AccessService/PublicKey",
47+
"/kas.AccessService/LegacyPublicKey",
4748
"/kas/kas_public_key",
4849
"/kas/v2/kas_public_key",
50+
// HealthZ
51+
"/healthz",
52+
"/grpc.health.v1.Health/Check",
4953
}
5054
// only asymmetric algorithms and no 'none'
5155
allowedSignatureAlgorithms = map[jwa.SignatureAlgorithm]bool{ //nolint:exhaustive // only asymmetric algorithms

service/internal/auth/casbin.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,13 @@ var defaultPolicy = `
4545
## gRPC routes
4646
p, role:org-admin, policy.*, *, allow
4747
p, role:org-admin, kasregistry.*, *, allow
48-
p, role:org-admin, kas.AccessService/LegacyPublicKey, *, allow
49-
p, role:org-admin, kas.AccessService/PublicKey, *, allow
5048
p, role:org-admin, kas.AccessService/Rewrap, *, allow
5149
## HTTP routes
5250
p, role:org-admin, /attributes*, *, allow
5351
p, role:org-admin, /namespaces*, *, allow
5452
p, role:org-admin, /subject-mappings*, *, allow
5553
p, role:org-admin, /resource-mappings*, *, allow
5654
p, role:org-admin, /key-access-servers*, *, allow
57-
p, role:org-admin, /kas.AccessService/LegacyPublicKey, *, allow
5855
p, role:org-admin, /kas/v2/rewrap, *, allow
5956
# add unsafe actions to the org-admin role
6057
@@ -64,15 +61,12 @@ p, role:admin, policy.*, *, allow
6461
p, role:admin, kasregistry.*, *, allow
6562
p, role:admin, kas.AccessService/Info, *, allow
6663
p, role:admin, kas.AccessService/Rewrap, *, allow
67-
p, role:admin, kas.AccessService/LegacyPublicKey, *, allow
68-
p, role:admin, kas.AccessService/PublicKey, *, allow
6964
## HTTP routes
7065
p, role:admin, /attributes*, *, allow
7166
p, role:admin, /namespaces*, *, allow
7267
p, role:admin, /subject-mappings*, *, allow
7368
p, role:admin, /resource-mappings*, *, allow
7469
p, role:admin, /key-access-servers*, *, allow
75-
p, role:admin, /kas.AccessService/LegacyPublicKey, *, allow
7670
p, role:admin, /kas/v2/rewrap, *, allow
7771
7872
## Role: Standard
@@ -81,28 +75,20 @@ p, role:standard, policy.*, read, allow
8175
p, role:standard, kasregistry.*, read, allow
8276
p, role:standard, kas.AccessService/Info, *, allow
8377
p, role:standard, kas.AccessService/Rewrap, *, allow
84-
p, role:standard, kas.AccessService/LegacyPublicKey, *, allow
85-
p, role:standard, kas.AccessService/PublicKey, *, allow
8678
## HTTP routes
8779
p, role:standard, /attributes*, read, allow
8880
p, role:standard, /namespaces*, read, allow
8981
p, role:standard, /subject-mappings*, read, allow
9082
p, role:standard, /resource-mappings*, read, allow
9183
p, role:standard, /key-access-servers*, read, allow
92-
p, role:standard, /kas/kas_public_key, read, allow
93-
p, role:standard, /kas/v2/kas_public_key, read, allow
9484
p, role:standard, /kas/v2/rewrap, write, allow
9585
p, role:standard, /entityresolution/resolve, write, allow
9686
9787
# Public routes
9888
## gRPC routes
99-
p, role:unknown, kas.AccessService/LegacyPublicKey, other, allow
100-
p, role:unknown, kas.AccessService/PublicKey, other, allow
10189
## for ERS, right now we don't care about requester role, just that a valid jwt is provided when the OPA engine calls (enforced in the ERS itself, not casbin)
10290
p, role:unknown, entityresolution.EntityResolutionService.ResolveEntities, write, allow
10391
## HTTP routes
104-
p, role:unknown, /kas/v2/kas_public_key, read, allow
105-
p, role:unknown, /kas/kas_public_key, read, allow
10692
## for ERS, right now we don't care about requester role, just that a valid jwt is provided when the OPA engine calls (enforced in the ERS itself, not casbin)
10793
p, role:unknown, /entityresolution/resolve, write, allow
10894
`

0 commit comments

Comments
 (0)