public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access control: Always append all permissions to role admin in oss (#46282)

Browse Source 
* Always append all permissions to built in role admin in oss
This commit is contained in:
Karl Persson
2022-03-07 13:28:39 +01:00
committed by GitHub
parent 00a8542ecf
commit 0debf33c76
6 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/common_test.go
+2 -2
View File
@@ -372,7 +372,7 @@ func setupHTTPServerWithCfg(t *testing.T, useFakeAccessControl, enableAccessCont
acmock = acmock.WithDisabled()
}
hs.AccessControl = acmock
teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(routeRegister, db, acmock, database.ProvideService(db))
teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, acmock, database.ProvideService(db))
require.NoError(t, err)
hs.teamPermissionsService = teamPermissionService
} else {
@@ -384,7 +384,7 @@ func setupHTTPServerWithCfg(t *testing.T, useFakeAccessControl, enableAccessCont
require.NoError(t, err)
err = ac.RegisterFixedRoles()
require.NoError(t, err)
teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(routeRegister, db, ac, database.ProvideService(db))
teamPermissionService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, routeRegister, db, ac, database.ProvideService(db))
require.NoError(t, err)
hs.teamPermissionsService = teamPermissionService
}