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

Sqlstore: guard against getting a dashboard without specifying identi… (#22246)

Browse Source 
* Sqlstore: guard against getting a dashboard without specifying identifier

* Sqlstore: linting
This commit is contained in:
Leonard Gram 2020-02-17 15:32:20 +01:00 committed by GitHub
parent 0c4dae321c
commit 10fbabfb2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/models/dashboards.go
View File

@ -32,6 +32,7 @@ var (
ErrDashboardUidToLong = errors.New("uid to long. max 40 characters") ErrDashboardUidToLong = errors.New("uid to long. max 40 characters")
ErrDashboardCannotSaveProvisionedDashboard = errors.New("Cannot save provisioned dashboard") ErrDashboardCannotSaveProvisionedDashboard = errors.New("Cannot save provisioned dashboard")
ErrDashboardCannotDeleteProvisionedDashboard = errors.New("provisioned dashboard cannot be deleted") ErrDashboardCannotDeleteProvisionedDashboard = errors.New("provisioned dashboard cannot be deleted")
ErrDashboardIdentifierNotSet = errors.New("Unique identfier needed to be able to get a dashboard")
RootFolderName = "General" RootFolderName = "General"
) )

4
pkg/services/sqlstore/dashboard.go
View File

@ -169,6 +169,10 @@ func generateNewDashboardUid(sess *DBSession, orgId int64) (string, error) {
} }
func GetDashboard(query *models.GetDashboardQuery) error { func GetDashboard(query *models.GetDashboardQuery) error {
if query.Id == 0 && len(query.Slug) == 0 && len(query.Uid) == 0 {
return models.ErrDashboardIdentifierNotSet
}
dashboard := models.Dashboard{Slug: query.Slug, OrgId: query.OrgId, Id: query.Id, Uid: query.Uid} dashboard := models.Dashboard{Slug: query.Slug, OrgId: query.OrgId, Id: query.Id, Uid: query.Uid}
has, err := x.Get(&dashboard) has, err := x.Get(&dashboard)

9
pkg/services/sqlstore/dashboard_test.go
View File

@ -88,6 +88,15 @@ func TestDashboardDataAccess(t *testing.T) {
So(query.Result.IsFolder, ShouldBeFalse) So(query.Result.IsFolder, ShouldBeFalse)
}) })
Convey("Shouldn't be able to get a dashboard with just an OrgID", func() {
query := m.GetDashboardQuery{
OrgId: 1,
}
err := GetDashboard(&query)
So(err, ShouldEqual, m.ErrDashboardIdentifierNotSet)
})
Convey("Should be able to delete dashboard", func() { Convey("Should be able to delete dashboard", func() {
dash := insertTestDashboard("delete me", 1, 0, false, "delete this") dash := insertTestDashboard("delete me", 1, 0, false, "delete this")