mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
ExtJwtClient: Use user namespace for k8s allowed namespace (#93687)
* ExtJwtClient: Use user namespace for k8s allowed namespace * fix test
This commit is contained in:
parent
5d45af1110
commit
b6fc695598
@ -127,13 +127,6 @@ func (s *ExtendedJWT) authenticateAsUser(
|
|||||||
return nil, errExtJWTInvalidSubject.Errorf("unexpected identity: %s", idTokenClaims.Subject)
|
return nil, errExtJWTInvalidSubject.Errorf("unexpected identity: %s", idTokenClaims.Subject)
|
||||||
}
|
}
|
||||||
|
|
||||||
// For use in service layer, allow higher privilege
|
|
||||||
namespace := accessTokenClaims.Rest.Namespace
|
|
||||||
if len(s.cfg.StackID) > 0 {
|
|
||||||
// For single-tenant cloud use, choose the lower of the two (id token will always have the specific namespace)
|
|
||||||
namespace = idTokenClaims.Rest.Namespace
|
|
||||||
}
|
|
||||||
|
|
||||||
return &authn.Identity{
|
return &authn.Identity{
|
||||||
ID: id,
|
ID: id,
|
||||||
Type: t,
|
Type: t,
|
||||||
@ -142,7 +135,7 @@ func (s *ExtendedJWT) authenticateAsUser(
|
|||||||
IDTokenClaims: &idTokenClaims,
|
IDTokenClaims: &idTokenClaims,
|
||||||
AuthenticatedBy: login.ExtendedJWTModule,
|
AuthenticatedBy: login.ExtendedJWTModule,
|
||||||
AuthID: accessTokenClaims.Subject,
|
AuthID: accessTokenClaims.Subject,
|
||||||
Namespace: namespace,
|
Namespace: idTokenClaims.Rest.Namespace,
|
||||||
ClientParams: authn.ClientParams{
|
ClientParams: authn.ClientParams{
|
||||||
SyncPermissions: true,
|
SyncPermissions: true,
|
||||||
FetchPermissionsParams: authn.FetchPermissionsParams{
|
FetchPermissionsParams: authn.FetchPermissionsParams{
|
||||||
|
@ -283,7 +283,7 @@ func TestExtendedJWT_Authenticate(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "should authenticate as user using wildcard namespace for access token",
|
name: "should authenticate as user in the user namespace",
|
||||||
accessToken: &validAccessTokenClaimsWildcard,
|
accessToken: &validAccessTokenClaimsWildcard,
|
||||||
idToken: &validIDTokenClaims,
|
idToken: &validIDTokenClaims,
|
||||||
orgID: 1,
|
orgID: 1,
|
||||||
@ -293,7 +293,7 @@ func TestExtendedJWT_Authenticate(t *testing.T) {
|
|||||||
OrgID: 1,
|
OrgID: 1,
|
||||||
AccessTokenClaims: &validAccessTokenClaimsWildcard,
|
AccessTokenClaims: &validAccessTokenClaimsWildcard,
|
||||||
IDTokenClaims: &validIDTokenClaims,
|
IDTokenClaims: &validIDTokenClaims,
|
||||||
Namespace: "*",
|
Namespace: "default",
|
||||||
AuthenticatedBy: "extendedjwt",
|
AuthenticatedBy: "extendedjwt",
|
||||||
AuthID: "access-policy:this-uid",
|
AuthID: "access-policy:this-uid",
|
||||||
ClientParams: authn.ClientParams{
|
ClientParams: authn.ClientParams{
|
||||||
|
Loading…
Reference in New Issue
Block a user