Merge pull request #9189 from fcfang123/issue-9149

对接RBAC权限优化 #9149
TencentBlueKing · Jul 25, 2023 · 81d0f93 · 81d0f93
2 parents ff0c14b + 1c0ee77
commit 81d0f93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...th-rbac/src/main/kotlin/com/tencent/devops/auth/service/migrate/MigrateV0PolicyService.kt b/...th-rbac/src/main/kotlin/com/tencent/devops/auth/service/migrate/MigrateV0PolicyService.kt
@@ -216,10 +216,10 @@ class MigrateV0PolicyService constructor(
                     logger.info("skip $action action")
                     rbacActions.remove(action)
                 }
-                certActions.contains(action) && !actions.contains(CERT_VIEW) -> {
+                certActions.contains(action) && !rbacActions.contains(CERT_VIEW) -> {
                     rbacActions.add(CERT_VIEW)
                 }
-                envNodeActions.contains(action) && !actions.contains(ENV_NODE_VIEW) -> {
+                envNodeActions.contains(action) && !rbacActions.contains(ENV_NODE_VIEW) -> {
                     rbacActions.add(ENV_NODE_VIEW)
                 }
             }

diff --git a/...nd/ci/core/auth/biz-auth-rbac/src/test/resources/v0/expected/group_web_policy_custom.json b/...nd/ci/core/auth/biz-auth-rbac/src/test/resources/v0/expected/group_web_policy_custom.json
@@ -59,6 +59,8 @@
   "system" : "bk_ci_rbac",
   "actions" : [ {
     "id" : "env_node_use"
+  },{
+    "id" : "env_node_edit"
   },{
     "id" : "env_node_view"
   }],

diff --git a/src/backend/ci/core/auth/biz-auth-rbac/src/test/resources/v0/group_web_policy_custom.json b/src/backend/ci/core/auth/biz-auth-rbac/src/test/resources/v0/group_web_policy_custom.json
@@ -69,6 +69,9 @@
       "actions": [
         {
           "id": "env_node_use"
+        },
+        {
+          "id": "env_node_edit"
         }
       ],
       "resources": [