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

Fix validation. #666

Merged
merged 2 commits into from
Feb 24, 2025
Merged

Fix validation. #666

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
bcf596f
Fix validation.
bigkevmcd Feb 7, 2025
97c85e1
Bump this to include the upstream change.
bigkevmcd Feb 21, 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
3 changes: 2 additions & 1 deletion docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,13 @@ This escalation check is bypassed if a user has the `bind` verb on the GlobalRol
#### Invalid Fields - Update
Users cannot update the following fields after creation:
- `userName`
- `userPrincipalName`
- `groupPrincipalName`
- `globalRoleName`


#### Invalid Fields - Create
GlobalRoleBindings must have either `userName` or `groupPrincipalName`, but not both.
GlobalRoleBindings must have one of `userName`, `userPrincipalName` or `groupPrincipalName` but not all.
All RoleTemplates which are referred to in the `inheritedClusterRoles` field must exist and not be locked.

### Mutation Checks
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/gorilla/mux v1.8.1
github.com/rancher/dynamiclistener v0.6.1
github.com/rancher/lasso v0.2.1
github.com/rancher/rancher/pkg/apis v0.0.0-20250220153925-3abb578f42fe
github.com/rancher/rancher/pkg/apis v0.0.0-20250221133435-39dbf8bc4a01
github.com/rancher/rke v1.8.0-rc.1
github.com/rancher/wrangler/v3 v3.2.0-rc.3
github.com/robfig/cron v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ github.com/rancher/lasso v0.2.1 h1:SZTqMVQn8cAOqvwGBd1/EYOIJ/MGN+UfJrOWvHd4jHU=
github.com/rancher/lasso v0.2.1/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM=
github.com/rancher/norman v0.5.1 h1:jbp49IcX2Hn+N2QA3MHdIXeUG0VgCSIjJs4xnqG+j90=
github.com/rancher/norman v0.5.1/go.mod h1:qX/OG/4wY27xSAcSdRilUBxBumV6Ey2CWpAeaKnBQDs=
github.com/rancher/rancher/pkg/apis v0.0.0-20250220153925-3abb578f42fe h1:DNGD4RCs1k5PxAHUc1zA9FiEfowcejQQcGAItwUIDh4=
github.com/rancher/rancher/pkg/apis v0.0.0-20250220153925-3abb578f42fe/go.mod h1:0JtLfvgj4YiwddyHEvhF3yEK9k5c22CWs55DppqdP5o=
github.com/rancher/rancher/pkg/apis v0.0.0-20250221133435-39dbf8bc4a01 h1:Co4AuY4AUcGO7VgNkzD39VHCJvN09XQ0Ivg1sOec4Ts=
github.com/rancher/rancher/pkg/apis v0.0.0-20250221133435-39dbf8bc4a01/go.mod h1:0JtLfvgj4YiwddyHEvhF3yEK9k5c22CWs55DppqdP5o=
github.com/rancher/rke v1.7.2 h1:+2fcl0gCjRHzf1ev9C9ptQ1pjYbDngC1Qv8V/0ki/dk=
github.com/rancher/rke v1.7.2/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A=
github.com/rancher/wrangler/v3 v3.2.0-rc.3 h1:MySHWLxLLrGrM2sq5YYp7Ol1kQqYt9lvIzjGR50UZ+c=
Expand Down
3 changes: 2 additions & 1 deletion pkg/resources/management.cattle.io/v3/globalrolebinding/GlobalRoleBinding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ This escalation check is bypassed if a user has the `bind` verb on the GlobalRol
### Invalid Fields - Update
Users cannot update the following fields after creation:
- `userName`
- `userPrincipalName`
- `groupPrincipalName`
- `globalRoleName`


### Invalid Fields - Create
GlobalRoleBindings must have either `userName` or `groupPrincipalName`, but not both.
GlobalRoleBindings must have one of `userName`, `userPrincipalName` or `groupPrincipalName` but not all.
All RoleTemplates which are referred to in the `inheritedClusterRoles` field must exist and not be locked.

## Mutation Checks
Expand Down
11 changes: 7 additions & 4 deletions pkg/resources/management.cattle.io/v3/globalrolebinding/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,14 @@ func validateUpdateFields(oldBinding, newBinding *v3.GlobalRoleBinding, fldPath

// validateCreateFields checks if all required fields are present and valid.
func (a *admitter) validateCreate(newBinding *v3.GlobalRoleBinding, globalRole *v3.GlobalRole, fldPath *field.Path) error {
hasUserTarget := newBinding.UserName != "" || newBinding.UserPrincipalName != ""
hasGroupTarget := newBinding.GroupPrincipalName != ""

switch {
case newBinding.UserName != "" && newBinding.GroupPrincipalName != "":
return field.Forbidden(fldPath, "bindings can not set both userName and groupPrincipalName")
case newBinding.UserName == "" && newBinding.GroupPrincipalName == "":
return field.Required(fldPath, "bindings must have either userName or groupPrincipalName set")
case hasUserTarget && hasGroupTarget:
return field.Forbidden(fldPath, "bindings can not set both userName/userPrincipalName and groupPrincipalName")
case (!hasUserTarget && !hasGroupTarget):
return field.Required(fldPath, "bindings must have either userName/userPrincipalName or groupPrincipalName set")
}

return a.validateGlobalRole(globalRole, fldPath)
Expand Down
15 changes: 15 additions & 0 deletions pkg/resources/management.cattle.io/v3/globalrolebinding/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,21 @@ func TestAdmit(t *testing.T) {
},
allowed: false,
},
{
name: "create gr with user principal name",
args: args{
newGRB: func() *v3.GlobalRoleBinding {
gr := newDefaultGRB()
gr.GlobalRoleName = baseGR.Name
gr.UserName = ""
gr.GroupPrincipalName = ""
gr.UserPrincipalName = "activedirectory_user://CN=test,CN=Users,DC=ad,DC=ians,DC=farm"

return gr
},
},
allowed: true,
},
{
name: "create gr refers to RT misc error",
args: args{
Expand Down
Loading