Snapshots: Store dashboard data encrypted in the database (#28129)
* end 2 end * fix import * refactor * introduce securedata * check err * use testify instead of convey * cleanup test * cleanup test * blob time * rename funcs
This commit is contained in:
@@ -86,7 +86,7 @@ func CreateDashboardSnapshot(c *models.ReqContext, cmd models.CreateDashboardSna
|
||||
|
||||
response, err := createExternalDashboardSnapshot(cmd)
|
||||
if err != nil {
|
||||
c.JsonApiErr(500, "Failed to create external snaphost", err)
|
||||
c.JsonApiErr(500, "Failed to create external snapshot", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ func CreateDashboardSnapshot(c *models.ReqContext, cmd models.CreateDashboardSna
|
||||
}
|
||||
|
||||
if err := bus.Dispatch(&cmd); err != nil {
|
||||
c.JsonApiErr(500, "Failed to create snaphost", err)
|
||||
c.JsonApiErr(500, "Failed to create snapshot", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -136,26 +136,29 @@ func CreateDashboardSnapshot(c *models.ReqContext, cmd models.CreateDashboardSna
|
||||
}
|
||||
|
||||
// GET /api/snapshots/:key
|
||||
func GetDashboardSnapshot(c *models.ReqContext) {
|
||||
func GetDashboardSnapshot(c *models.ReqContext) Response {
|
||||
key := c.Params(":key")
|
||||
query := &models.GetDashboardSnapshotQuery{Key: key}
|
||||
|
||||
err := bus.Dispatch(query)
|
||||
if err != nil {
|
||||
c.JsonApiErr(500, "Failed to get dashboard snapshot", err)
|
||||
return
|
||||
return Error(500, "Failed to get dashboard snapshot", err)
|
||||
}
|
||||
|
||||
snapshot := query.Result
|
||||
|
||||
// expired snapshots should also be removed from db
|
||||
if snapshot.Expires.Before(time.Now()) {
|
||||
c.JsonApiErr(404, "Dashboard snapshot not found", err)
|
||||
return
|
||||
return Error(404, "Dashboard snapshot not found", err)
|
||||
}
|
||||
|
||||
dashboard, err := snapshot.DashboardJSON()
|
||||
if err != nil {
|
||||
return Error(500, "Failed to get dashboard data for dashboard snapshot", err)
|
||||
}
|
||||
|
||||
dto := dtos.DashboardFullWithMeta{
|
||||
Dashboard: snapshot.Dashboard,
|
||||
Dashboard: dashboard,
|
||||
Meta: dtos.DashboardMeta{
|
||||
Type: models.DashTypeSnapshot,
|
||||
IsSnapshot: true,
|
||||
@@ -166,8 +169,7 @@ func GetDashboardSnapshot(c *models.ReqContext) {
|
||||
|
||||
metrics.MApiDashboardSnapshotGet.Inc()
|
||||
|
||||
c.Resp.Header().Set("Cache-Control", "public, max-age=3600")
|
||||
c.JSON(200, dto)
|
||||
return JSON(200, dto).Header("Cache-Control", "public, max-age=3600")
|
||||
}
|
||||
|
||||
func deleteExternalDashboardSnapshot(externalUrl string) error {
|
||||
@@ -238,7 +240,10 @@ func DeleteDashboardSnapshot(c *models.ReqContext) Response {
|
||||
if query.Result == nil {
|
||||
return Error(404, "Failed to get dashboard snapshot", nil)
|
||||
}
|
||||
dashboard := query.Result.Dashboard
|
||||
dashboard, err := query.Result.DashboardJSON()
|
||||
if err != nil {
|
||||
return Error(500, "Failed to get dashboard data for dashboard snapshot", err)
|
||||
}
|
||||
dashboardID := dashboard.Get("id").MustInt64()
|
||||
|
||||
guardian := guardian.New(dashboardID, c.OrgId, c.SignedInUser)
|
||||
|
||||
Reference in New Issue
Block a user