Skip to content

fix: The manager(non-admin user) of the application is unable to select a list of apps when assigning permissions. #4053

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 2 commits into from
Oct 10, 2023
Merged

fix: The manager(non-admin user) of the application is unable to select a list of apps when assigning permissions. #4053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69d0c78
App RBAC name fix
Ashish-devtron Oct 10, 2023
1183fcf
App RBAC name fix
Ashish-devtron Oct 10, 2023
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
3 changes: 1 addition & 2 deletions api/restHandler/AppRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package restHandler

import (
"encoding/json"
"fmt"
client "github.com/devtron-labs/devtron/api/helm-app"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/pkg/app"
Expand Down Expand Up @@ -330,7 +329,7 @@ func (handler AppRestHandlerImpl) GetAppListByTeamIds(w http.ResponseWriter, r *
accessedApps = append(accessedApps, app)
continue
}
object := fmt.Sprintf("%s/%s", project.ProjectName, app.Name)
object := handler.enforcerUtil.GetAppRBACNameByAppAndProjectName(project.ProjectName, app.Name)
if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object); ok {
accessedApps = append(accessedApps, app)
}
Expand Down
5 changes: 5 additions & 0 deletions util/rbac/EnforcerUtil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type EnforcerUtil interface {
GetRbacObjectsByAppIds(appIds []int) map[int]string
GetAllActiveTeamNames() ([]string, error)
GetRbacObjectsByEnvIdsAndAppId(envIds []int, appId int) (map[int]string, map[string]string)
GetAppRBACNameByAppAndProjectName(projectName, appName string) string
}

type EnforcerUtilImpl struct {
Expand Down Expand Up @@ -604,3 +605,7 @@ func (impl EnforcerUtilImpl) GetAllActiveTeamNames() ([]string, error) {
}
return teamNames, nil
}

func (impl EnforcerUtilImpl) GetAppRBACNameByAppAndProjectName(projectName, appName string) string {
return fmt.Sprintf("%s/%s", strings.ToLower(projectName), strings.ToLower(appName))
}