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

Fix static path matching issue in macaron (#40023)

Browse Source 
Co-authored-by: Malcolm Holmes <mdh@odoko.co.uk>
This commit is contained in:
Marcus Efraimsson
2021-10-05 19:38:09 +02:00
committed by GitHub
parent feaa56a7fe
commit 329f96db1a
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/dashboard_snapshot.go
View File

@@ -147,6 +147,10 @@ func CreateDashboardSnapshot(c *models.ReqContext, cmd models.CreateDashboardSna
// GET /api/snapshots/:key // GET /api/snapshots/:key
func GetDashboardSnapshot(c *models.ReqContext) response.Response { func GetDashboardSnapshot(c *models.ReqContext) response.Response {
key := macaron.Params(c.Req)[":key"] key := macaron.Params(c.Req)[":key"]
if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil)
}
query := &models.GetDashboardSnapshotQuery{Key: key} query := &models.GetDashboardSnapshotQuery{Key: key}
err := bus.Dispatch(query) err := bus.Dispatch(query)
@@ -211,6 +215,9 @@ func deleteExternalDashboardSnapshot(externalUrl string) error {
// GET /api/snapshots-delete/:deleteKey // GET /api/snapshots-delete/:deleteKey
func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response { func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response {
key := macaron.Params(c.Req)[":deleteKey"] key := macaron.Params(c.Req)[":deleteKey"]
if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil)
}
query := &models.GetDashboardSnapshotQuery{DeleteKey: key} query := &models.GetDashboardSnapshotQuery{DeleteKey: key}
@@ -241,6 +248,9 @@ func DeleteDashboardSnapshotByDeleteKey(c *models.ReqContext) response.Response
// DELETE /api/snapshots/:key // DELETE /api/snapshots/:key
func DeleteDashboardSnapshot(c *models.ReqContext) response.Response { func DeleteDashboardSnapshot(c *models.ReqContext) response.Response {
key := macaron.Params(c.Req)[":key"] key := macaron.Params(c.Req)[":key"]
if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil)
}
query := &models.GetDashboardSnapshotQuery{Key: key} query := &models.GetDashboardSnapshotQuery{Key: key}

10
pkg/macaron/router.go
View File

@@ -207,10 +207,12 @@ func (r *Router) NotFound(handlers ...Handler) {
func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) { func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if t, ok := r.routers[req.Method]; ok { if t, ok := r.routers[req.Method]; ok {
// Fast match for static routes // Fast match for static routes
leaf := r.getLeaf(req.Method, req.URL.Path) if !strings.ContainsAny(req.URL.Path, ":*") {
if leaf != nil { leaf := r.getLeaf(req.Method, req.URL.Path)
leaf.handle(rw, req, nil) if leaf != nil {
return leaf.handle(rw, req, nil)
return
}
} }
h, p, ok := t.Match(req.URL.EscapedPath()) h, p, ok := t.Match(req.URL.EscapedPath())