Skip to content

fix: check rbac on env if envName is present #5765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 29, 2024
Merged

fix: check rbac on env if envName is present #5765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d70480
admin check fix in config draft
prakash100198 Aug 29, 2024
8773a20
minor fix
prakash100198 Aug 29, 2024
d0e7e98
Merge branch 'main' into admin-check-fix
prakash100198 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions api/restHandler/DeploymentConfigurationRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ func (handler *DeploymentConfigurationRestHandlerImpl) enforceForAppAndEnv(appNa
return false
}

object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
return false
if len(envName) > 0 {
object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
return false
}
}
return true
}
Expand Down
1 change: 1 addition & 0 deletions pkg/configDiff/DeploymentConfigurationService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func (impl *DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, en
if _, ok := cmcsKeyPropertyEnvLevelMap[key]; !ok {
if envId > 0 {
configProperty.ConfigStage = bean2.Inheriting
configProperty.Id = 0
}

}
Expand Down