diff --git a/pkg/microservice/aslan/core/build/handler/build.go b/pkg/microservice/aslan/core/build/handler/build.go index 8a2143bedf211dbb53679cb42fcbaf39c72d7d7b..7e127eae6d262be0221731b3ab17f94974f9b8e6 100644 --- a/pkg/microservice/aslan/core/build/handler/build.go +++ b/pkg/microservice/aslan/core/build/handler/build.go @@ -95,8 +95,8 @@ func ListBuildModules(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeEnvironment, types.EnvActionEditConfig) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } @@ -146,8 +146,8 @@ func ListBuildModulesByServiceModule(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeWorkflow, types.WorkflowActionEdit) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } diff --git a/pkg/microservice/aslan/core/build/handler/target.go b/pkg/microservice/aslan/core/build/handler/target.go index 4c49559e1b0d204b009bd1f2057a8d640c9edfc8..c67b4bfab305222026879956ffcfcc5e7f1542f9 100644 --- a/pkg/microservice/aslan/core/build/handler/target.go +++ b/pkg/microservice/aslan/core/build/handler/target.go @@ -60,8 +60,8 @@ func ListDeployTarget(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeEnvironment, types.EnvActionEditConfig) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } @@ -103,8 +103,8 @@ func ListBuildModulesForProduct(c *gin.Context) { } collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeWorkflow, types.WorkflowActionRun) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } diff --git a/pkg/microservice/aslan/core/environment/handler/environment.go b/pkg/microservice/aslan/core/environment/handler/environment.go index b0170fc059c9ff82def9bf8c1c67b181809c1798..c16de6da33232ff1a1162bc935ddf7b20db2bb94 100644 --- a/pkg/microservice/aslan/core/environment/handler/environment.go +++ b/pkg/microservice/aslan/core/environment/handler/environment.go @@ -95,12 +95,12 @@ func ListProducts(c *gin.Context) { projectInfo.Env.View { hasPermission = true } - } - - permittedEnv, _ := internalhandler.ListCollaborationEnvironmentsPermission(ctx.UserID, projectName) - if permittedEnv != nil && len(permittedEnv.ReadEnvList) > 0 { - hasPermission = true - envFilter = permittedEnv.ReadEnvList + } else { + permittedEnv, _ := internalhandler.ListCollaborationEnvironmentsPermission(ctx.UserID, projectName) + if permittedEnv != nil && len(permittedEnv.ReadEnvList) > 0 { + hasPermission = true + envFilter = permittedEnv.ReadEnvList + } } if !hasPermission { diff --git a/pkg/microservice/aslan/core/service/handler/service.go b/pkg/microservice/aslan/core/service/handler/service.go index 800ad5b14739ebdc098d2a33fbc9d6fe6a9149ab..ab8ee0a50b5b9f137db05a3b6cc5ba9eedca3482 100644 --- a/pkg/microservice/aslan/core/service/handler/service.go +++ b/pkg/microservice/aslan/core/service/handler/service.go @@ -165,8 +165,8 @@ func GetServiceTemplateOption(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectName, types.ResourceTypeEnvironment, types.EnvActionEditConfig) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } diff --git a/pkg/microservice/aslan/core/workflow/handler/workflow.go b/pkg/microservice/aslan/core/workflow/handler/workflow.go index 3a0cc8be698e291e3b067dba33d1c458dd16d283..bc461e3bedf013943855cedaa73d720f63080d21 100644 --- a/pkg/microservice/aslan/core/workflow/handler/workflow.go +++ b/pkg/microservice/aslan/core/workflow/handler/workflow.go @@ -94,8 +94,8 @@ func AutoCreateWorkflow(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeEnvironment, types.EnvActionEditConfig) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } diff --git a/pkg/microservice/aslan/core/workflow/testing/handler/scanning.go b/pkg/microservice/aslan/core/workflow/testing/handler/scanning.go index 16bb2ab70df2be96443ae33057880fba327e1f0a..384170ddbbf14f0413fd2cc087ca2ec3950372b6 100644 --- a/pkg/microservice/aslan/core/workflow/testing/handler/scanning.go +++ b/pkg/microservice/aslan/core/workflow/testing/handler/scanning.go @@ -208,8 +208,8 @@ func ListScanningModule(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeWorkflow, types.WorkflowActionEdit) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } } diff --git a/pkg/microservice/aslan/core/workflow/testing/handler/testing.go b/pkg/microservice/aslan/core/workflow/testing/handler/testing.go index 4f22256587f54eb5ea6892a72960f7bb7ccf6c1e..e7223537f89902905afe405d71f3179f718e2cea 100644 --- a/pkg/microservice/aslan/core/workflow/testing/handler/testing.go +++ b/pkg/microservice/aslan/core/workflow/testing/handler/testing.go @@ -220,8 +220,8 @@ func GetTestModule(c *gin.Context) { // finally check if the permission is given by collaboration mode collaborationAuthorizedEdit, err := internalhandler.CheckPermissionGivenByCollaborationMode(ctx.UserID, projectKey, types.ResourceTypeWorkflow, types.WorkflowActionEdit) - if err == nil { - permitted = collaborationAuthorizedEdit + if err == nil && collaborationAuthorizedEdit { + permitted = true } }