IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Datasources: allow for query but with warning (#93091)

Browse Source 
allow for query but with warning
This commit is contained in:
Eric Leijonmarck
2024-09-10 10:19:02 +01:00
committed by GitHub
parent 544dbce708
commit f3ede1f53d
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/datasources.go
View File

@@ -54,7 +54,7 @@ func (hs *HTTPServer) GetDataSources(c *contextmodel.ReqContext) response.Respon
return response.Error(http.StatusInternalServerError, "Failed to query datasources", err) return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
} }
filtered, err := hs.dsGuardian.New(c.SignedInUser.OrgID, c.SignedInUser).FilterDatasourcesByQueryPermissions(dataSources) filtered, err := hs.dsGuardian.New(c.SignedInUser.OrgID, c.SignedInUser).FilterDatasourcesByReadPermissions(dataSources)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "Failed to query datasources", err) return response.Error(http.StatusInternalServerError, "Failed to query datasources", err)
} }

2
pkg/api/frontendsettings.go
View File

@@ -412,7 +412,7 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlug
// If RBAC is enabled, it will filter out all datasources for a public user, so we need to skip it // If RBAC is enabled, it will filter out all datasources for a public user, so we need to skip it
orgDataSources = dataSources orgDataSources = dataSources
} else { } else {
filtered, err := hs.dsGuardian.New(c.SignedInUser.OrgID, c.SignedInUser).FilterDatasourcesByQueryPermissions(dataSources) filtered, err := hs.dsGuardian.New(c.SignedInUser.OrgID, c.SignedInUser).FilterDatasourcesByReadPermissions(dataSources)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
pkg/services/datasources/guardian/allow_guardian.go
View File

@@ -14,6 +14,10 @@ func (n AllowGuardian) CanQuery(datasourceID int64) (bool, error) {
return true, nil return true, nil
} }
func (n AllowGuardian) FilterDatasourcesByReadPermissions(ds []*datasources.DataSource) ([]*datasources.DataSource, error) {
return ds, nil
}
func (n AllowGuardian) FilterDatasourcesByQueryPermissions(ds []*datasources.DataSource) ([]*datasources.DataSource, error) { func (n AllowGuardian) FilterDatasourcesByQueryPermissions(ds []*datasources.DataSource) ([]*datasources.DataSource, error) {
return ds, nil return ds, nil
} }

1
pkg/services/datasources/guardian/provider.go
View File

@@ -11,6 +11,7 @@ type DatasourceGuardianProvider interface {
type DatasourceGuardian interface { type DatasourceGuardian interface {
CanQuery(datasourceID int64) (bool, error) CanQuery(datasourceID int64) (bool, error)
FilterDatasourcesByReadPermissions([]*datasources.DataSource) ([]*datasources.DataSource, error)
FilterDatasourcesByQueryPermissions([]*datasources.DataSource) ([]*datasources.DataSource, error) FilterDatasourcesByQueryPermissions([]*datasources.DataSource) ([]*datasources.DataSource, error)
} }