fix(cli): argocd CLI RBAC validation doesn't work on actions (argopro…

…j#13911) (argoproj#14578) (argoproj#14582) * argoproj#11602 fix : Object options menu truncated when selected in ApplicationListView. * argoproj#11602 fix : Object options menu truncated when selected in ApplicationListView. * changes for argocd_rbac --------- Signed-off-by: schakradari <[email protected]> Signed-off-by: schakrad <[email protected]> Co-authored-by: schakrad <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: schakrad <[email protected]>
schakrad · Jul 24, 2023 · 4e0a678 · 4e0a678
1 parent b5b5195
commit 4e0a678
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmd/argocd/commands/admin/settings_rbac.go b/cmd/argocd/commands/admin/settings_rbac.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
@@ -373,6 +374,9 @@ func resolveRBACResourceName(name string) string {
 
 // isValidRBACAction checks whether a given action is a valid RBAC action
 func isValidRBACAction(action string) bool {
+	if strings.HasPrefix(action, rbacpolicy.ActionAction+"/") {
+		return true
+	}
 	_, ok := validRBACActions[action]
 	return ok
 }

diff --git a/cmd/argocd/commands/admin/settings_rbac_test.go b/cmd/argocd/commands/admin/settings_rbac_test.go
@@ -27,6 +27,11 @@ func Test_isValidRBACAction(t *testing.T) {
 	})
 }
 
+func Test_isValidRBACAction_ActionAction(t *testing.T) {
+	ok := isValidRBACAction("action/apps/Deployment/restart")
+	assert.True(t, ok)
+}
+
 func Test_isValidRBACResource(t *testing.T) {
 	for k := range validRBACResources {
 		t.Run(k, func(t *testing.T) {