IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

updated namespace extractor usage

Browse Source
This commit is contained in:
Claudiu Dragalina-Paraipan 2024-09-24 18:44:38 +03:00
parent a6c977ba4d
commit 52f248eebb
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/authn/grpcutils/ns_authorizer.go
View File

@ -25,6 +25,6 @@ func NewNamespaceAuthorizer(cfg *setting.Cfg) authzlib.AuthorizeFunc {
return authzlib.NamespaceAuthorizationFunc( return authzlib.NamespaceAuthorizationFunc(
na, na,
authzlib.MetadataStackIDExtractor(authzlib.DefaultStackIDMetadataKey), authzlib.MetadataNamespaceExtractor(authzlib.DefaultNamespaceMetadataKey),
) )
} }

19
pkg/storage/unified/resource/client.go
View File

@ -79,7 +79,7 @@ func NewGRPCResourceClient(conn *grpc.ClientConn) (ResourceClient, error) {
&authnlib.GrpcClientConfig{}, &authnlib.GrpcClientConfig{},
authnlib.WithDisableAccessTokenOption(), authnlib.WithDisableAccessTokenOption(),
authnlib.WithIDTokenExtractorOption(idTokenExtractor), authnlib.WithIDTokenExtractorOption(idTokenExtractor),
authnlib.WithMetadataExtractorOption(orgIdExtractor), authnlib.WithMetadataExtractorOption(namespaceExtractor),
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -99,7 +99,7 @@ func NewCloudResourceClient(conn *grpc.ClientConn, cfg *setting.Cfg) (ResourceCl
opts := []authnlib.GrpcClientInterceptorOption{ opts := []authnlib.GrpcClientInterceptorOption{
authnlib.WithIDTokenExtractorOption(idTokenExtractor), authnlib.WithIDTokenExtractorOption(idTokenExtractor),
authnlib.WithMetadataExtractorOption(stackIdExtractor(cfg.StackID)), authnlib.WithMetadataExtractorOption(namespaceCloudExtractor(cfg.StackID)),
} }
if cfg.Env == setting.Dev { if cfg.Env == setting.Dev {
@ -146,18 +146,23 @@ func idTokenExtractor(ctx context.Context) (string, error) {
return "", fmt.Errorf("id-token not found") return "", fmt.Errorf("id-token not found")
} }
func orgIdExtractor(ctx context.Context) (key string, values []string, err error) { func namespaceExtractor(ctx context.Context) (string, []string, error) {
requester, err := identity.GetRequester(ctx) // Using identity.Requester instead of claims.AuthInfo because Namespace() relies on AllowedKubernetesNamespace, which is empty.
caller, err := identity.GetRequester(ctx)
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
return authzlib.DefaultStackIDMetadataKey, []string{fmt.Sprintf("%d", requester.GetOrgID())}, nil namespace := caller.GetAllowedKubernetesNamespace()
if namespace == "" {
namespace = claims.OrgNamespaceFormatter(caller.GetOrgID())
}
return authzlib.DefaultNamespaceMetadataKey, []string{namespace}, nil
} }
func stackIdExtractor(stackID string) func(ctx context.Context) (key string, values []string, err error) { func namespaceCloudExtractor(stackID string) func(ctx context.Context) (key string, values []string, err error) {
return func(ctx context.Context) (key string, values []string, err error) { return func(ctx context.Context) (key string, values []string, err error) {
return authzlib.DefaultStackIDMetadataKey, []string{stackID}, nil return authzlib.DefaultNamespaceMetadataKey, []string{"stacks-" + stackID}, nil
} }
} }