constants added

Author: prkhrkat

api/restHandler/ImageScanRestHandler.go

@@ -34,6 +34,12 @@ import (
 	"go.uber.org/zap"
 )
 
+const (
+	ObjectTypeApp   = "app"
+	ObjectTypeChart = "chart"
+	ObjectTypePod   = "pod"
+)
+
 type ImageScanRestHandler interface {
 	ScanExecutionList(w http.ResponseWriter, r *http.Request)
 	FetchExecutionDetail(w http.ResponseWriter, r *http.Request)
@@ -100,7 +106,7 @@ func (impl ImageScanRestHandlerImpl) ScanExecutionList(w http.ResponseWriter, r
 
 	IdToAppEnvPairs := make(map[int][2]int)
 	for _, item := range deployInfoList {
-		if item.ScanObjectMetaId > 0 && (item.ObjectType == "app" || item.ObjectType == "chart") {
+		if item.ScanObjectMetaId > 0 && (item.ObjectType == ObjectTypeApp || item.ObjectType == ObjectTypeChart) {
 			IdToAppEnvPairs[item.Id] = [2]int{item.ScanObjectMetaId, item.EnvId}
 		}
 	}
@@ -112,7 +118,7 @@ func (impl ImageScanRestHandlerImpl) ScanExecutionList(w http.ResponseWriter, r
 	}
 
 	for _, item := range deployInfoList {
-		if item.ScanObjectMetaId > 0 && (item.ObjectType == "app" || item.ObjectType == "chart") {
+		if item.ScanObjectMetaId > 0 && (item.ObjectType == ObjectTypeApp || item.ObjectType == ObjectTypeChart) {
 			appObject := appObjects[item.Id]
 			envObject := envObjects[item.Id]
 			if appObject != "" {
@@ -121,7 +127,7 @@ func (impl ImageScanRestHandlerImpl) ScanExecutionList(w http.ResponseWriter, r
 			if envObject != "" {
 				envRBACObjects = append(envRBACObjects, envObject)
 			}
-		} else if item.ScanObjectMetaId > 0 && (item.ObjectType == "pod") {
+		} else if item.ScanObjectMetaId > 0 && (item.ObjectType == ObjectTypePod) {
 			environments, err := impl.environmentService.GetByClusterId(item.ClusterId)
 			if err != nil {
 				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -140,7 +146,7 @@ func (impl ImageScanRestHandlerImpl) ScanExecutionList(w http.ResponseWriter, r
 	podResults := impl.enforcer.EnforceInBatch(token, casbin.ResourceGlobalEnvironment, casbin.ActionGet, podRBACObjects)
 
 	for _, item := range deployInfoList {
-		if impl.enforcerUtil.IsAuthorizedForApp(item.ScanObjectMetaId, appResults, appIdtoApp) && impl.enforcerUtil.IsAuthorizedForEnv(item.ScanObjectMetaId, item.EnvId, envResults, appIdtoApp, envIdToEnv) {
+		if impl.enforcerUtil.IsAuthorizedForAppInAppResults(item.ScanObjectMetaId, appResults, appIdtoApp) && impl.enforcerUtil.IsAuthorizedForEnvInEnvResults(item.ScanObjectMetaId, item.EnvId, envResults, appIdtoApp, envIdToEnv) {
 			ids = append(ids, item.Id)
 		}
 	}

util/rbac/EnforcerUtil.go

@@ -38,8 +38,8 @@ import (
 
 type EnforcerUtil interface {
 	GetAppAndEnvRBACNamesByAppAndEnvIds(IdToAppEnvPairs map[int][2]int) (map[int]string, map[int]string, map[int]*app.App, map[int]*repository.Environment, error)
-	IsAuthorizedForApp(appId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App) bool
-	IsAuthorizedForEnv(appId int, envId int, appResults map[string]bool, appIdtoApp map[int]*app.App, envIdToEnv map[int]*repository.Environment) bool
+	IsAuthorizedForAppInAppResults(appId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App) bool
+	IsAuthorizedForEnvInEnvResults(appId int, envId int, appResults map[string]bool, appIdtoApp map[int]*app.App, envIdToEnv map[int]*repository.Environment) bool
 	GetAppRBACName(appName string) string
 	GetRbacObjectsForAllApps(appType helper.AppType) map[int]string
 	GetRbacObjectsForAllAppsWithTeamID(teamID int, appType helper.AppType) map[int]string
@@ -114,7 +114,7 @@ func NewEnforcerUtilImpl(logger *zap.SugaredLogger, teamRepository team.TeamRepo
 	}
 }
 
-func (impl EnforcerUtilImpl) IsAuthorizedForApp(appId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App) bool {
+func (impl EnforcerUtilImpl) IsAuthorizedForAppInAppResults(appId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App) bool {
 	app, appExists := appIdtoApp[appId]
 	if !appExists {
 		return false
@@ -127,7 +127,7 @@ func (impl EnforcerUtilImpl) IsAuthorizedForApp(appId int, rbacResults map[strin
 	return false
 }
 
-func (impl EnforcerUtilImpl) IsAuthorizedForEnv(appId int, envId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App, envIdToEnv map[int]*repository.Environment) bool {
+func (impl EnforcerUtilImpl) IsAuthorizedForEnvInEnvResults(appId int, envId int, rbacResults map[string]bool, appIdtoApp map[int]*app.App, envIdToEnv map[int]*repository.Environment) bool {
 	app, appExists := appIdtoApp[appId]
 	if !appExists {
 		return false