Merge pull request #3913 from PetrusZ/ft/improve_bizdir

fix service label auth in bizdir
koderover · Dec 25, 2024 · 3a15f99 · 3a15f99
2 parents 5997727 + 03a24b6
commit 3a15f99
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/pkg/microservice/aslan/core/service/handler/service.go b/pkg/microservice/aslan/core/service/handler/service.go
@@ -1326,21 +1326,24 @@ func ListServiceLabels(c *gin.Context) {
 	}
 
 	if !ctx.Resources.IsSystemAdmin {
-		if _, ok := ctx.Resources.ProjectAuthInfo[req.ProjectKey]; !ok {
-			ctx.UnAuthorized = true
-			return
-		}
-		if boolptr.IsTrue(production) {
-			if !ctx.Resources.ProjectAuthInfo[req.ProjectKey].IsProjectAdmin &&
-				!ctx.Resources.ProjectAuthInfo[req.ProjectKey].ProductionService.View {
+		if !ctx.Resources.SystemActions.BusinessDirectory.View {
+			if _, ok := ctx.Resources.ProjectAuthInfo[req.ProjectKey]; !ok {
 				ctx.UnAuthorized = true
 				return
 			}
-		} else {
-			if !ctx.Resources.ProjectAuthInfo[req.ProjectKey].IsProjectAdmin &&
-				!ctx.Resources.ProjectAuthInfo[req.ProjectKey].Service.View {
-				ctx.UnAuthorized = true
-				return
+
+			if boolptr.IsTrue(production) {
+				if !ctx.Resources.ProjectAuthInfo[req.ProjectKey].IsProjectAdmin &&
+					!ctx.Resources.ProjectAuthInfo[req.ProjectKey].ProductionService.View {
+					ctx.UnAuthorized = true
+					return
+				}
+			} else {
+				if !ctx.Resources.ProjectAuthInfo[req.ProjectKey].IsProjectAdmin &&
+					!ctx.Resources.ProjectAuthInfo[req.ProjectKey].Service.View {
+					ctx.UnAuthorized = true
+					return
+				}
 			}
 		}
 	}