feat: 目录权限支持绑定用户组 TencentBlueKing#1664

* feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat:新增用户组管理 TencentBlueKing#1649 * feat: 目录权限支持绑定用户组 TencentBlueKing#1664 * feat: 目录权限支持绑定用户组 TencentBlueKing#1664 * feat: 目录权限支持绑定用户组 TencentBlueKing#1664 * feat: 目录权限支持绑定用户组 TencentBlueKing#1664 --------- Co-authored-by: lannoy0523 <[email protected]>
gujunling · Jan 19, 2024 · 6451bed · 6451bed
1 parent b42bb33
commit 6451bed
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...h/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/local/PermissionServiceImpl.kt b/...h/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/local/PermissionServiceImpl.kt
@@ -417,9 +417,17 @@ open class PermissionServiceImpl constructor(
             repoName,
         )
 
+        return getNoPermissionPathFromConfig(userId, user.roles, projectPermission)
+    }
+
+    private fun getNoPermissionPathFromConfig(
+        userId: String,
+        roles: List<String>,
+        config: List<TPermission>
+    ): List<String> {
         val excludePath = mutableListOf<String>()
         val includePath = mutableListOf<String>()
-        projectPermission.forEach {
+        config.forEach {
             if (it.users.contains(userId)) {
                 if (it.excludePattern.isNotEmpty()) {
                     excludePath.addAll(it.excludePattern)
@@ -433,7 +441,7 @@ open class PermissionServiceImpl constructor(
                 }
             }
 
-            val interRole = it.roles.intersect(user.roles.toSet())
+            val interRole = it.roles.intersect(roles.toSet())
             if (interRole.isNotEmpty()) {
                 if (it.excludePattern.isNotEmpty()) {
                     excludePath.addAll(it.excludePattern)