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.

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

feat(rbac): fine-grained update/delete for application resources #18124

Merged
merged 16 commits into from
May 13, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
update map
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault committed May 10, 2024
commit 4f6ea9317312706fafefe3903b69430b67211602
41 changes: 25 additions & 16 deletions cmd/argocd/commands/admin/settings_rbac.go
Original file line number Diff line number Diff line change
@@ -54,27 +54,32 @@ var resourceMap map[string]string = map[string]string{

// List of allowed RBAC resources
var validRBACResourcesActions map[string]actionTraitMap = map[string]actionTraitMap{
rbacpolicy.ResourceAccounts: validRBACActions,
rbacpolicy.ResourceApplications: validRBACApplicationsActions,
rbacpolicy.ResourceApplicationSets: validRBACActions,
rbacpolicy.ResourceCertificates: validRBACActions,
rbacpolicy.ResourceClusters: validRBACActions,
rbacpolicy.ResourceExtensions: validRBACExtensionActions,
rbacpolicy.ResourceGPGKeys: validRBACActions,
rbacpolicy.ResourceLogs: validRBACLogActions,
rbacpolicy.ResourceExec: validRBACExecActions,
rbacpolicy.ResourceProjects: validRBACActions,
rbacpolicy.ResourceRepositories: validRBACActions,
rbacpolicy.ResourceAccounts: accountsActions,
rbacpolicy.ResourceApplications: applicationsActions,
rbacpolicy.ResourceApplicationSets: defaultCRUDActions,
rbacpolicy.ResourceCertificates: defaultCRDActions,
rbacpolicy.ResourceClusters: defaultCRUDActions,
rbacpolicy.ResourceExtensions: extensionActions,
rbacpolicy.ResourceGPGKeys: defaultCRDActions,
rbacpolicy.ResourceLogs: logsActions,
rbacpolicy.ResourceExec: execActions,
rbacpolicy.ResourceProjects: defaultCRUDActions,
rbacpolicy.ResourceRepositories: defaultCRUDActions,
}

// List of allowed RBAC actions
var validRBACActions = actionTraitMap{
var defaultCRUDActions = actionTraitMap{
rbacpolicy.ActionCreate: rbacTrait{},
rbacpolicy.ActionGet: rbacTrait{},
rbacpolicy.ActionUpdate: rbacTrait{},
rbacpolicy.ActionDelete: rbacTrait{},
}
var validRBACApplicationsActions = actionTraitMap{
var defaultCRDActions = actionTraitMap{
rbacpolicy.ActionCreate: rbacTrait{},
rbacpolicy.ActionGet: rbacTrait{},
rbacpolicy.ActionDelete: rbacTrait{},
}
var applicationsActions = actionTraitMap{
rbacpolicy.ActionCreate: rbacTrait{},
rbacpolicy.ActionGet: rbacTrait{},
rbacpolicy.ActionUpdate: rbacTrait{allowPath: true},
@@ -83,13 +88,17 @@ var validRBACApplicationsActions = actionTraitMap{
rbacpolicy.ActionOverride: rbacTrait{},
rbacpolicy.ActionSync: rbacTrait{},
}
var validRBACExecActions = actionTraitMap{
var accountsActions = actionTraitMap{
rbacpolicy.ActionCreate: rbacTrait{},
rbacpolicy.ActionUpdate: rbacTrait{},
}
var execActions = actionTraitMap{
rbacpolicy.ActionCreate: rbacTrait{},
}
var validRBACLogActions = actionTraitMap{
var logsActions = actionTraitMap{
rbacpolicy.ActionGet: rbacTrait{},
}
var validRBACExtensionActions = actionTraitMap{
var extensionActions = actionTraitMap{
rbacpolicy.ActionInvoke: rbacTrait{},
}