Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include role name in Entity Alias metadata #160

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Include role name in Entity Alias metadata #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions path_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (b *jwtAuthBackend) pathLogin(ctx context.Context, req *logical.Request, d
return logical.ErrorResponse("audience claim found in JWT but no audiences bound to the role"), nil
}

alias, groupAliases, err := b.createIdentity(ctx, allClaims, role, nil)
alias, groupAliases, err := b.createIdentity(ctx, allClaims, roleName, role, nil)
if err != nil {
return logical.ErrorResponse(err.Error()), nil
}
Expand All @@ -171,7 +171,7 @@ func (b *jwtAuthBackend) pathLogin(ctx context.Context, req *logical.Request, d
return logical.ErrorResponse("error validating claims: %s", err.Error()), nil
}

tokenMetadata := map[string]string{"role": roleName}
tokenMetadata := make(map[string]string)
for k, v := range alias.Metadata {
tokenMetadata[k] = v
}
Expand Down Expand Up @@ -217,7 +217,7 @@ func (b *jwtAuthBackend) pathLoginRenew(ctx context.Context, req *logical.Reques

// createIdentity creates an alias and set of groups aliases based on the role
// definition and received claims.
func (b *jwtAuthBackend) createIdentity(ctx context.Context, allClaims map[string]interface{}, role *jwtRole, tokenSource oauth2.TokenSource) (*logical.Alias, []*logical.Alias, error) {
func (b *jwtAuthBackend) createIdentity(ctx context.Context, allClaims map[string]interface{}, roleName string, role *jwtRole, tokenSource oauth2.TokenSource) (*logical.Alias, []*logical.Alias, error) {
var userClaimRaw interface{}
if role.UserClaimJSONPointer {
userClaimRaw = getClaim(b.Logger(), allClaims, role.UserClaim)
Expand Down Expand Up @@ -246,6 +246,8 @@ func (b *jwtAuthBackend) createIdentity(ctx context.Context, allClaims map[strin
if err != nil {
return nil, nil, err
}
// add role name to the Entity Alias metadata
metadata["role"] = roleName

alias := &logical.Alias{
Name: userName,
Expand Down
2 changes: 1 addition & 1 deletion path_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,14 @@ func testLogin_JWT(t *testing.T, jwks bool) {
metadata := map[string]string{
"name": "jeff2",
"primary_org": "engineering",
"role": "plugin-test",
}

if diff := deep.Equal(auth.Alias.Metadata, metadata); diff != nil {
t.Fatal(diff)
}

// check token metadata
metadata["role"] = "plugin-test"
if diff := deep.Equal(auth.Metadata, metadata); diff != nil {
t.Fatal(diff)
}
Expand Down
4 changes: 2 additions & 2 deletions path_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ func (b *jwtAuthBackend) pathCallback(ctx context.Context, req *logical.Request,
}
}

alias, groupAliases, err := b.createIdentity(ctx, allClaims, role, tokenSource)
alias, groupAliases, err := b.createIdentity(ctx, allClaims, roleName, role, tokenSource)
if err != nil {
return logical.ErrorResponse(err.Error()), nil
}
Expand All @@ -327,7 +327,7 @@ func (b *jwtAuthBackend) pathCallback(ctx context.Context, req *logical.Request,
return logical.ErrorResponse("error validating claims: %s", err.Error()), nil
}

tokenMetadata := map[string]string{"role": roleName}
tokenMetadata := make(map[string]string)
for k, v := range alias.Metadata {
tokenMetadata[k] = v
}
Expand Down
1 change: 1 addition & 0 deletions path_oidc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,7 @@ func TestOIDC_Callback(t *testing.T) {
Alias: &logical.Alias{
Name: "[email protected]",
Metadata: map[string]string{
"role": "test",
"color": "green",
"size": "medium",
},
Expand Down