opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-28 14:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drilldown: Require datasources:explore RBAC action (#101366)

Browse Source 
Drilldown: Require `datasources:explore` acton
This commit is contained in:
Sven Grossmann
2025-02-26 17:33:05 +01:00
committed by GitHub
parent c3505f0864
commit b5faf5d9a1
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/accesscontrol.go
View File

@ -66,9 +66,6 @@ func (hs *HTTPServer) declareFixedRoles() error {
{ {
Action: ac.ActionDatasourcesExplore, Action: ac.ActionDatasourcesExplore,
}, },
{
Action: ac.ActionDatasourcesDrilldown,
},
}, },
}, },
Grants: []string{string(org.RoleEditor)}, Grants: []string{string(org.RoleEditor)},

2
pkg/api/api.go
View File

@ -183,7 +183,7 @@ func (hs *HTTPServer) registerRoutes() {
} }
r.Get("/explore", authorize(ac.EvalPermission(ac.ActionDatasourcesExplore)), hs.Index) r.Get("/explore", authorize(ac.EvalPermission(ac.ActionDatasourcesExplore)), hs.Index)
r.Get("/drilldown", authorize(ac.EvalPermission(ac.ActionDatasourcesDrilldown)), hs.Index) r.Get("/drilldown", authorize(ac.EvalPermission(ac.ActionDatasourcesExplore)), hs.Index)
r.Get("/playlists/", reqSignedIn, hs.Index) r.Get("/playlists/", reqSignedIn, hs.Index)
r.Get("/playlists/*", reqSignedIn, hs.Index) r.Get("/playlists/*", reqSignedIn, hs.Index)

3
pkg/services/accesscontrol/models.go
View File

@ -386,8 +386,7 @@ const (
ActionSettingsWrite = "settings:write" ActionSettingsWrite = "settings:write"
// Datasources actions // Datasources actions
ActionDatasourcesExplore = "datasources:explore" ActionDatasourcesExplore = "datasources:explore"
ActionDatasourcesDrilldown = "datasources:drilldown"
// Global Scopes // Global Scopes
ScopeGlobalUsersAll = "global.users:*" ScopeGlobalUsersAll = "global.users:*"

2
pkg/services/navtree/navtreeimpl/navtree.go
View File

@ -130,7 +130,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
}) })
} }
if hasAccess(ac.EvalPermission(ac.ActionDatasourcesDrilldown)) { if hasAccess(ac.EvalPermission(ac.ActionDatasourcesExplore)) {
drilldownChildNavLinks := s.buildDrilldownNavLinks(c) drilldownChildNavLinks := s.buildDrilldownNavLinks(c)
treeRoot.AddSection(&navtree.NavLink{ treeRoot.AddSection(&navtree.NavLink{
Text: "Drilldown", Text: "Drilldown",