Skip to content

fix(server): avoid unecessary claims restrictions (#22973) (3.0) #23207

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

Merged
crenshaw-dev merged 2 commits into from
May 29, 2025
Merged

fix(server): avoid unecessary claims restrictions (#22973) (3.0) #23207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ead69
fix(server): avoid unecessary claims restrictions (#22973) (3.0)
crenshaw-dev May 29, 2025
b8b393f
fix test
crenshaw-dev May 29, 2025
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
16 changes: 16 additions & 0 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,22 @@ func TestGetClaims(t *testing.T) {
UserInfoCacheExpiration: "5m",
},
},
{
test: "GetClaimsWithGroupsString",
claims: jwt.MapClaims{
"aud": common.ArgoCDClientAppID,
"exp": defaultExpiry,
"sub": "randomUser",
"groups": "group1",
},
expectedErrorContains: "",
expectedClaims: jwt.MapClaims{
"aud": common.ArgoCDClientAppID,
"exp": defaultExpiryUnix,
"sub": "randomUser",
"groups": "group1",
},
},
}

for _, testData := range tests {
Expand Down
7 changes: 3 additions & 4 deletions util/claims/claims.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import (
// ArgoClaims defines the claims structure based on Dex's documented claims
type ArgoClaims struct {
jwt.RegisteredClaims
Email string `json:"email,omitempty"`
EmailVerified bool `json:"email_verified,omitempty"`
Name string `json:"name,omitempty"`
Groups []string `json:"groups,omitempty"`
Email string `json:"email,omitempty"`
EmailVerified bool `json:"email_verified,omitempty"`
Name string `json:"name,omitempty"`
// As per Dex docs, federated_claims has a specific structure
FederatedClaims *FederatedClaims `json:"federated_claims,omitempty"`
}
Expand Down
4 changes: 0 additions & 4 deletions util/claims/claims_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ func TestMapClaimsToArgoClaims(t *testing.T) {
Email: "email@test.com",
EmailVerified: true,
Name: "the-name",
Groups: []string{
"my-org:my-team2",
"my-org:my-team1",
},
FederatedClaims: &FederatedClaims{
ConnectorID: "my-connector",
UserID: "user-id",
Expand Down
Loading