apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Chore: replace macaron with web package (#40136)

Browse Source 
* replace macaron with web package

* add web.go
pull/40285/head
Serge Zaitsev 4 years ago committed by GitHub
parent 78ebac0116
commit 57fcfd578d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 369 additions and 375 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      pkg/api/alerting.go
  2. 10
      pkg/api/app_routes.go
  3. 5
      pkg/api/avatar/avatar.go
  4. 13
      pkg/api/common_test.go
  5. 15
      pkg/api/dashboard.go
  6. 8
      pkg/api/dashboard_snapshot.go
  7. 4
      pkg/api/dashboard_test.go
  8. 14
      pkg/api/datasources.go
  9. 10
      pkg/api/folder.go
  10. 7
      pkg/api/folder_permission.go
  11. 13
      pkg/api/frontendsettings_test.go
  12. 4
      pkg/api/grafana_com_proxy.go
  13. 6
      pkg/api/health_test.go
  14. 40
      pkg/api/http_server.go
  15. 4
      pkg/api/ldap_debug.go
  16. 4
      pkg/api/login.go
  17. 7
      pkg/api/login_oauth.go
  18. 4
      pkg/api/org.go
  19. 6
      pkg/api/org_invite.go
  20. 20
      pkg/api/pluginproxy/ds_proxy_test.go
  21. 28
      pkg/api/plugins.go
  22. 6
      pkg/api/quota.go
  23. 4
      pkg/api/render.go
  24. 52
      pkg/api/routing/route_register.go
  25. 14
      pkg/api/routing/route_register_test.go
  26. 4
      pkg/api/routing/routing.go
  27. 4
      pkg/api/short_url.go
  28. 12
      pkg/api/static/static.go
  29. 11
      pkg/api/team_test.go
  30. 6
      pkg/macaron/macaron.go
  31. 13
      pkg/middleware/auth.go
  32. 6
      pkg/middleware/gziper.go
  33. 8
      pkg/middleware/logger.go
  34. 15
      pkg/middleware/middleware.go
  35. 11
      pkg/middleware/middleware_test.go
  36. 6
      pkg/middleware/org_redirect.go
  37. 7
      pkg/middleware/quota.go
  38. 4
      pkg/middleware/quota_test.go
  39. 7
      pkg/middleware/rate_limit.go
  40. 6
      pkg/middleware/rate_limit_test.go
  41. 7
      pkg/middleware/recovery.go
  42. 6
      pkg/middleware/recovery_test.go
  43. 10
      pkg/middleware/request_metrics.go
  44. 12
      pkg/middleware/request_tracing.go
  45. 7
      pkg/middleware/testing.go
  46. 4
      pkg/middleware/validate_host.go
  47. 4
      pkg/models/context.go
  48. 4
      pkg/models/context_test.go
  49. 9
      pkg/services/accesscontrol/middleware/middleware.go
  50. 11
      pkg/services/accesscontrol/middleware/middleware_test.go
  51. 4
      pkg/services/contexthandler/auth_proxy_test.go
  52. 4
      pkg/services/contexthandler/authproxy/authproxy_test.go
  53. 8
      pkg/services/contexthandler/contexthandler.go
  54. 6
      pkg/services/contexthandler/contexthandler_test.go
  55. 13
      pkg/services/libraryelements/api.go
  56. 9
      pkg/services/libraryelements/libraryelements_delete_test.go
  57. 21
      pkg/services/libraryelements/libraryelements_get_test.go
  58. 39
      pkg/services/libraryelements/libraryelements_patch_test.go
  59. 23
      pkg/services/libraryelements/libraryelements_permissions_test.go
  60. 9
      pkg/services/libraryelements/libraryelements_test.go
  61. 6
      pkg/services/live/live.go
  62. 8
      pkg/services/live/pushhttp/push.go
  63. 6
      pkg/services/ngalert/api/api_alertmanager.go
  64. 25
      pkg/services/ngalert/api/api_ruler.go
  65. 4
      pkg/services/ngalert/api/api_testing.go
  66. 6
      pkg/services/ngalert/api/lotex_am.go
  67. 16
      pkg/services/ngalert/api/lotex_ruler.go
  68. 6
      pkg/services/ngalert/api/util.go
  69. 6
      pkg/services/ngalert/metrics/ngalert.go
  70. 17
      pkg/web/web.go

8
pkg/api/alerting.go
Unescape View File

@ -16,7 +16,7 @@ import (
"github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/search"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func ValidateOrgAlert(c *models.ReqContext) { func ValidateOrgAlert(c *models.ReqContext) {
@ -258,7 +258,7 @@ func GetAlertNotificationByID(c *models.ReqContext) response.Response {
func GetAlertNotificationByUID(c *models.ReqContext) response.Response { func GetAlertNotificationByUID(c *models.ReqContext) response.Response {
query := &models.GetAlertNotificationsWithUidQuery{ query := &models.GetAlertNotificationsWithUidQuery{
OrgId: c.OrgId, OrgId: c.OrgId,
Uid: macaron.Params(c.Req)[":uid"], Uid: web.Params(c.Req)[":uid"],
} }
if query.Uid == "" { if query.Uid == "" {
@ -318,7 +318,7 @@ func (hs *HTTPServer) UpdateAlertNotification(c *models.ReqContext, cmd models.U
func (hs *HTTPServer) UpdateAlertNotificationByUID(c *models.ReqContext, cmd models.UpdateAlertNotificationWithUidCommand) response.Response { func (hs *HTTPServer) UpdateAlertNotificationByUID(c *models.ReqContext, cmd models.UpdateAlertNotificationWithUidCommand) response.Response {
cmd.OrgId = c.OrgId cmd.OrgId = c.OrgId
cmd.Uid = macaron.Params(c.Req)[":uid"] cmd.Uid = web.Params(c.Req)[":uid"]
err := hs.fillWithSecureSettingsDataByUID(c.Req.Context(), &cmd) err := hs.fillWithSecureSettingsDataByUID(c.Req.Context(), &cmd)
if err != nil { if err != nil {
@ -419,7 +419,7 @@ func DeleteAlertNotification(c *models.ReqContext) response.Response {
func DeleteAlertNotificationByUID(c *models.ReqContext) response.Response { func DeleteAlertNotificationByUID(c *models.ReqContext) response.Response {
cmd := models.DeleteAlertNotificationWithUidCommand{ cmd := models.DeleteAlertNotificationWithUidCommand{
OrgId: c.OrgId, OrgId: c.OrgId,
Uid: macaron.Params(c.Req)[":uid"], Uid: web.Params(c.Req)[":uid"],
} }
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {

10
pkg/api/app_routes.go
Unescape View File

@ -13,12 +13,12 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var pluginProxyTransport *http.Transport var pluginProxyTransport *http.Transport
func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) { func (hs *HTTPServer) initAppPluginRoutes(r *web.Mux) {
pluginProxyTransport = &http.Transport{ pluginProxyTransport = &http.Transport{
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: hs.Cfg.PluginsAppsSkipVerifyTLS, InsecureSkipVerify: hs.Cfg.PluginsAppsSkipVerifyTLS,
@ -35,7 +35,7 @@ func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) {
for _, plugin := range hs.PluginManager.Apps() { for _, plugin := range hs.PluginManager.Apps() {
for _, route := range plugin.Routes { for _, route := range plugin.Routes {
url := util.JoinURLFragments("/api/plugin-proxy/"+plugin.Id, route.Path) url := util.JoinURLFragments("/api/plugin-proxy/"+plugin.Id, route.Path)
handlers := make([]macaron.Handler, 0) handlers := make([]web.Handler, 0)
handlers = append(handlers, middleware.Auth(&middleware.AuthOptions{ handlers = append(handlers, middleware.Auth(&middleware.AuthOptions{
ReqSignedIn: true, ReqSignedIn: true,
})) }))
@ -56,9 +56,9 @@ func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) {
} }
} }
func AppPluginRoute(route *plugins.AppPluginRoute, appID string, hs *HTTPServer) macaron.Handler { func AppPluginRoute(route *plugins.AppPluginRoute, appID string, hs *HTTPServer) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
path := macaron.Params(c.Req)["*"] path := web.Params(c.Req)["*"]
proxy := pluginproxy.NewApiPluginProxy(c, path, route, appID, hs.Cfg, hs.EncryptionService) proxy := pluginproxy.NewApiPluginProxy(c, path, route, appID, hs.Cfg, hs.EncryptionService)
proxy.Transport = pluginProxyTransport proxy.Transport = pluginProxyTransport

5
pkg/api/avatar/avatar.go
Unescape View File

@ -23,8 +23,7 @@ import (
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
gocache "github.com/patrickmn/go-cache" gocache "github.com/patrickmn/go-cache"
) )
@ -78,7 +77,7 @@ type CacheServer struct {
var validMD5 = regexp.MustCompile("^[a-fA-F0-9]{32}$") var validMD5 = regexp.MustCompile("^[a-fA-F0-9]{32}$")
func (a *CacheServer) Handler(ctx *models.ReqContext) { func (a *CacheServer) Handler(ctx *models.ReqContext) {
hash := macaron.Params(ctx.Req)[":hash"] hash := web.Params(ctx.Req)[":hash"]
if len(hash) != 32 || !validMD5.MatchString(hash) { if len(hash) != 32 || !validMD5.MatchString(hash) {
ctx.JsonApiErr(404, "Avatar not found", nil) ctx.JsonApiErr(404, "Avatar not found", nil)

13
pkg/api/common_test.go
Unescape View File

@ -12,9 +12,6 @@ import (
"github.com/grafana/grafana/pkg/services/searchusers" "github.com/grafana/grafana/pkg/services/searchusers"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
@ -29,6 +26,8 @@ import (
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require"
) )
func loggedInUserScenario(t *testing.T, desc string, url string, fn scenarioFunc) { func loggedInUserScenario(t *testing.T, desc string, url string, fn scenarioFunc) {
@ -148,12 +147,12 @@ func (sc *scenarioContext) fakeReqNoAssertionsWithCookie(method, url string, coo
type scenarioContext struct { type scenarioContext struct {
t *testing.T t *testing.T
cfg *setting.Cfg cfg *setting.Cfg
m *macaron.Macaron m *web.Mux
context *models.ReqContext context *models.ReqContext
resp *httptest.ResponseRecorder resp *httptest.ResponseRecorder
handlerFunc handlerFunc handlerFunc handlerFunc
handlerFuncCtx handlerFuncCtx handlerFuncCtx handlerFuncCtx
defaultHandler macaron.Handler defaultHandler web.Handler
req *http.Request req *http.Request
url string url string
userAuthTokenService *auth.FakeUserAuthTokenService userAuthTokenService *auth.FakeUserAuthTokenService
@ -200,8 +199,8 @@ func setupScenarioContext(t *testing.T, url string) *scenarioContext {
require.NoError(t, err) require.NoError(t, err)
require.Truef(t, exists, "Views should be in %q", viewsPath) require.Truef(t, exists, "Views should be in %q", viewsPath)
sc.m = macaron.New() sc.m = web.New()
sc.m.UseMiddleware(macaron.Renderer(viewsPath, "[[", "]]")) sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
sc.m.Use(getContextHandler(t, cfg).Middleware) sc.m.Use(getContextHandler(t, cfg).Middleware)
return sc return sc

15
pkg/api/dashboard.go
Unescape View File

@ -8,19 +8,18 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/dashboards"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/dashdiffs" "github.com/grafana/grafana/pkg/components/dashdiffs"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
) )
const ( const (
@ -71,7 +70,7 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa
} }
func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response {
uid := macaron.Params(c.Req)[":uid"] uid := web.Params(c.Req)[":uid"]
dash, rsp := getDashboardHelper(c.Req.Context(), c.OrgId, 0, uid) dash, rsp := getDashboardHelper(c.Req.Context(), c.OrgId, 0, uid)
if rsp != nil { if rsp != nil {
return rsp return rsp
@ -215,7 +214,7 @@ func getDashboardHelper(ctx context.Context, orgID int64, id int64, uid string)
} }
func (hs *HTTPServer) DeleteDashboardBySlug(c *models.ReqContext) response.Response { func (hs *HTTPServer) DeleteDashboardBySlug(c *models.ReqContext) response.Response {
query := models.GetDashboardsBySlugQuery{OrgId: c.OrgId, Slug: macaron.Params(c.Req)[":slug"]} query := models.GetDashboardsBySlugQuery{OrgId: c.OrgId, Slug: web.Params(c.Req)[":slug"]}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
return response.Error(500, "Failed to retrieve dashboards by slug", err) return response.Error(500, "Failed to retrieve dashboards by slug", err)
@ -233,7 +232,7 @@ func (hs *HTTPServer) DeleteDashboardByUID(c *models.ReqContext) response.Respon
} }
func (hs *HTTPServer) deleteDashboard(c *models.ReqContext) response.Response { func (hs *HTTPServer) deleteDashboard(c *models.ReqContext) response.Response {
dash, rsp := getDashboardHelper(c.Req.Context(), c.OrgId, 0, macaron.Params(c.Req)[":uid"]) dash, rsp := getDashboardHelper(c.Req.Context(), c.OrgId, 0, web.Params(c.Req)[":uid"])
if rsp != nil { if rsp != nil {
return rsp return rsp
} }

8
pkg/api/dashboard_snapshot.go
Unescape View File

@ -16,7 +16,7 @@ import (
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var client = &http.Client{ var client = &http.Client{
@ -146,7 +146,7 @@ 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 := web.Params(c.Req)[":key"]
if len(key) == 0 { if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil) return response.Error(404, "Snapshot not found", nil)
} }
@ -214,7 +214,7 @@ 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 := web.Params(c.Req)[":deleteKey"]
if len(key) == 0 { if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil) return response.Error(404, "Snapshot not found", nil)
} }
@ -247,7 +247,7 @@ 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 := web.Params(c.Req)[":key"]
if len(key) == 0 { if len(key) == 0 {
return response.Error(404, "Snapshot not found", nil) return response.Error(404, "Snapshot not found", nil)
} }

4
pkg/api/dashboard_test.go
Unescape View File

@ -26,15 +26,15 @@ import (
"github.com/grafana/grafana/pkg/services/quota" "github.com/grafana/grafana/pkg/services/quota"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
) )
func TestGetHomeDashboard(t *testing.T) { func TestGetHomeDashboard(t *testing.T) {
httpReq, err := http.NewRequest(http.MethodGet, "", nil) httpReq, err := http.NewRequest(http.MethodGet, "", nil)
require.NoError(t, err) require.NoError(t, err)
req := &models.ReqContext{SignedInUser: &models.SignedInUser{}, Context: &macaron.Context{Req: httpReq}} req := &models.ReqContext{SignedInUser: &models.SignedInUser{}, Context: &web.Context{Req: httpReq}}
cfg := setting.NewCfg() cfg := setting.NewCfg()
cfg.StaticRootPath = "../../public/" cfg.StaticRootPath = "../../public/"

14
pkg/api/datasources.go
Unescape View File

@ -17,7 +17,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/adapters" "github.com/grafana/grafana/pkg/plugins/adapters"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var datasourcesLogger = log.New("datasources") var datasourcesLogger = log.New("datasources")
@ -119,7 +119,7 @@ func (hs *HTTPServer) DeleteDataSourceById(c *models.ReqContext) response.Respon
// GET /api/datasources/uid/:uid // GET /api/datasources/uid/:uid
func GetDataSourceByUID(c *models.ReqContext) response.Response { func GetDataSourceByUID(c *models.ReqContext) response.Response {
ds, err := getRawDataSourceByUID(macaron.Params(c.Req)[":uid"], c.OrgId) ds, err := getRawDataSourceByUID(web.Params(c.Req)[":uid"], c.OrgId)
if err != nil { if err != nil {
if errors.Is(err, models.ErrDataSourceNotFound) { if errors.Is(err, models.ErrDataSourceNotFound) {
@ -134,7 +134,7 @@ func GetDataSourceByUID(c *models.ReqContext) response.Response {
// DELETE /api/datasources/uid/:uid // DELETE /api/datasources/uid/:uid
func (hs *HTTPServer) DeleteDataSourceByUID(c *models.ReqContext) response.Response { func (hs *HTTPServer) DeleteDataSourceByUID(c *models.ReqContext) response.Response {
uid := macaron.Params(c.Req)[":uid"] uid := web.Params(c.Req)[":uid"]
if uid == "" { if uid == "" {
return response.Error(400, "Missing datasource uid", nil) return response.Error(400, "Missing datasource uid", nil)
@ -165,7 +165,7 @@ func (hs *HTTPServer) DeleteDataSourceByUID(c *models.ReqContext) response.Respo
} }
func (hs *HTTPServer) DeleteDataSourceByName(c *models.ReqContext) response.Response { func (hs *HTTPServer) DeleteDataSourceByName(c *models.ReqContext) response.Response {
name := macaron.Params(c.Req)[":name"] name := web.Params(c.Req)[":name"]
if name == "" { if name == "" {
return response.Error(400, "Missing valid datasource name", nil) return response.Error(400, "Missing valid datasource name", nil)
@ -334,7 +334,7 @@ func getRawDataSourceByUID(uid string, orgID int64) (*models.DataSource, error)
// Get /api/datasources/name/:name // Get /api/datasources/name/:name
func GetDataSourceByName(c *models.ReqContext) response.Response { func GetDataSourceByName(c *models.ReqContext) response.Response {
query := models.GetDataSourceQuery{Name: macaron.Params(c.Req)[":name"], OrgId: c.OrgId} query := models.GetDataSourceQuery{Name: web.Params(c.Req)[":name"], OrgId: c.OrgId}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
if errors.Is(err, models.ErrDataSourceNotFound) { if errors.Is(err, models.ErrDataSourceNotFound) {
@ -349,7 +349,7 @@ func GetDataSourceByName(c *models.ReqContext) response.Response {
// Get /api/datasources/id/:name // Get /api/datasources/id/:name
func GetDataSourceIdByName(c *models.ReqContext) response.Response { func GetDataSourceIdByName(c *models.ReqContext) response.Response {
query := models.GetDataSourceQuery{Name: macaron.Params(c.Req)[":name"], OrgId: c.OrgId} query := models.GetDataSourceQuery{Name: web.Params(c.Req)[":name"], OrgId: c.OrgId}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
if errors.Is(err, models.ErrDataSourceNotFound) { if errors.Is(err, models.ErrDataSourceNotFound) {
@ -397,7 +397,7 @@ func (hs *HTTPServer) CallDatasourceResource(c *models.ReqContext) {
PluginID: plugin.Id, PluginID: plugin.Id,
DataSourceInstanceSettings: dsInstanceSettings, DataSourceInstanceSettings: dsInstanceSettings,
} }
hs.BackendPluginManager.CallResource(pCtx, c, macaron.Params(c.Req)["*"]) hs.BackendPluginManager.CallResource(pCtx, c, web.Params(c.Req)["*"])
} }
func convertModelToDtos(ds *models.DataSource) dtos.DataSource { func convertModelToDtos(ds *models.DataSource) dtos.DataSource {

10
pkg/api/folder.go
Unescape View File

@ -13,7 +13,7 @@ import (
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/libraryelements" "github.com/grafana/grafana/pkg/services/libraryelements"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func (hs *HTTPServer) GetFolders(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetFolders(c *models.ReqContext) response.Response {
@ -39,7 +39,7 @@ func (hs *HTTPServer) GetFolders(c *models.ReqContext) response.Response {
func (hs *HTTPServer) GetFolderByUID(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetFolderByUID(c *models.ReqContext) response.Response {
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore) s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
folder, err := s.GetFolderByUID(c.Req.Context(), macaron.Params(c.Req)[":uid"]) folder, err := s.GetFolderByUID(c.Req.Context(), web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
} }
@ -79,7 +79,7 @@ func (hs *HTTPServer) CreateFolder(c *models.ReqContext, cmd models.CreateFolder
func (hs *HTTPServer) UpdateFolder(c *models.ReqContext, cmd models.UpdateFolderCommand) response.Response { func (hs *HTTPServer) UpdateFolder(c *models.ReqContext, cmd models.UpdateFolderCommand) response.Response {
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore) s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
err := s.UpdateFolder(c.Req.Context(), macaron.Params(c.Req)[":uid"], &cmd) err := s.UpdateFolder(c.Req.Context(), web.Params(c.Req)[":uid"], &cmd)
if err != nil { if err != nil {
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
} }
@ -90,7 +90,7 @@ func (hs *HTTPServer) UpdateFolder(c *models.ReqContext, cmd models.UpdateFolder
func (hs *HTTPServer) DeleteFolder(c *models.ReqContext) response.Response { // temporarily adding this function to HTTPServer, will be removed from HTTPServer when librarypanels featuretoggle is removed func (hs *HTTPServer) DeleteFolder(c *models.ReqContext) response.Response { // temporarily adding this function to HTTPServer, will be removed from HTTPServer when librarypanels featuretoggle is removed
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore) s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
err := hs.LibraryElementService.DeleteLibraryElementsInFolder(c.Req.Context(), c.SignedInUser, macaron.Params(c.Req)[":uid"]) err := hs.LibraryElementService.DeleteLibraryElementsInFolder(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
if errors.Is(err, libraryelements.ErrFolderHasConnectedLibraryElements) { if errors.Is(err, libraryelements.ErrFolderHasConnectedLibraryElements) {
return response.Error(403, "Folder could not be deleted because it contains library elements in use", err) return response.Error(403, "Folder could not be deleted because it contains library elements in use", err)
@ -98,7 +98,7 @@ func (hs *HTTPServer) DeleteFolder(c *models.ReqContext) response.Response { //
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
} }
f, err := s.DeleteFolder(c.Req.Context(), macaron.Params(c.Req)[":uid"], c.QueryBool("forceDeleteRules")) f, err := s.DeleteFolder(c.Req.Context(), web.Params(c.Req)[":uid"], c.QueryBool("forceDeleteRules"))
if err != nil { if err != nil {
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
} }

7
pkg/api/folder_permission.go
Unescape View File

@ -4,8 +4,6 @@ import (
"errors" "errors"
"time" "time"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/apierrors" "github.com/grafana/grafana/pkg/api/apierrors"
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
@ -13,11 +11,12 @@ import (
"github.com/grafana/grafana/pkg/services/dashboards" "github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
) )
func (hs *HTTPServer) GetFolderPermissionList(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetFolderPermissionList(c *models.ReqContext) response.Response {
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore) s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
folder, err := s.GetFolderByUID(c.Req.Context(), macaron.Params(c.Req)[":uid"]) folder, err := s.GetFolderByUID(c.Req.Context(), web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
@ -65,7 +64,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *models.ReqContext, apiCmd dtos.
} }
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore) s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
folder, err := s.GetFolderByUID(c.Req.Context(), macaron.Params(c.Req)[":uid"]) folder, err := s.GetFolderByUID(c.Req.Context(), web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return apierrors.ToFolderErrorResponse(err) return apierrors.ToFolderErrorResponse(err)
} }

13
pkg/api/frontendsettings_test.go
Unescape View File

@ -7,10 +7,6 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/plugins/manager" "github.com/grafana/grafana/pkg/plugins/manager"
accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock" accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
@ -18,9 +14,12 @@ import (
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func setupTestEnvironment(t *testing.T, cfg *setting.Cfg) (*macaron.Macaron, *HTTPServer) { func setupTestEnvironment(t *testing.T, cfg *setting.Cfg) (*web.Mux, *HTTPServer) {
t.Helper() t.Helper()
sqlstore.InitTestDB(t) sqlstore.InitTestDB(t)
@ -53,9 +52,9 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg) (*macaron.Macaron, *HT
AccessControl: accesscontrolmock.New().WithDisabled(), AccessControl: accesscontrolmock.New().WithDisabled(),
} }
m := macaron.New() m := web.New()
m.Use(getContextHandler(t, cfg).Middleware) m.Use(getContextHandler(t, cfg).Middleware)
m.UseMiddleware(macaron.Renderer(filepath.Join(setting.StaticRootPath, "views"), "[[", "]]")) m.UseMiddleware(web.Renderer(filepath.Join(setting.StaticRootPath, "views"), "[[", "]]"))
m.Get("/api/frontend/settings/", hs.GetFrontendSettings) m.Get("/api/frontend/settings/", hs.GetFrontendSettings)
return m, hs return m, hs

4
pkg/api/grafana_com_proxy.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var grafanaComProxyTransport = &http.Transport{ var grafanaComProxyTransport = &http.Transport{
@ -42,7 +42,7 @@ func ReverseProxyGnetReq(proxyPath string) *httputil.ReverseProxy {
} }
func ProxyGnetRequest(c *models.ReqContext) { func ProxyGnetRequest(c *models.ReqContext) {
proxyPath := macaron.Params(c.Req)["*"] proxyPath := web.Params(c.Req)["*"]
proxy := ReverseProxyGnetReq(proxyPath) proxy := ReverseProxyGnetReq(proxyPath)
proxy.Transport = grafanaComProxyTransport proxy.Transport = grafanaComProxyTransport
proxy.ServeHTTP(c.Resp, c.Req) proxy.ServeHTTP(c.Resp, c.Req)

6
pkg/api/health_test.go
Unescape View File

@ -11,8 +11,8 @@ import (
"github.com/grafana/grafana/pkg/infra/localcache" "github.com/grafana/grafana/pkg/infra/localcache"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
macaron "gopkg.in/macaron.v1"
) )
func TestHealthAPI_Version(t *testing.T) { func TestHealthAPI_Version(t *testing.T) {
@ -167,13 +167,13 @@ func TestHealthAPI_DatabaseHealthCached(t *testing.T) {
require.True(t, healthy.(bool)) require.True(t, healthy.(bool))
} }
func setupHealthAPITestEnvironment(t *testing.T, cbs ...func(*setting.Cfg)) (*macaron.Macaron, *HTTPServer) { func setupHealthAPITestEnvironment(t *testing.T, cbs ...func(*setting.Cfg)) (*web.Mux, *HTTPServer) {
t.Helper() t.Helper()
bus.ClearBusHandlers() bus.ClearBusHandlers()
t.Cleanup(bus.ClearBusHandlers) t.Cleanup(bus.ClearBusHandlers)
m := macaron.New() m := web.New()
cfg := setting.NewCfg() cfg := setting.NewCfg()
for _, cb := range cbs { for _, cb := range cbs {
cb(cfg) cb(cfg)

40
pkg/api/http_server.go
Unescape View File

@ -57,17 +57,17 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/util/errutil" "github.com/grafana/grafana/pkg/util/errutil"
"github.com/grafana/grafana/pkg/web"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"gopkg.in/macaron.v1"
) )
type HTTPServer struct { type HTTPServer struct {
log log.Logger log log.Logger
macaron *macaron.Macaron web *web.Mux
context context.Context context context.Context
httpSrv *http.Server httpSrv *http.Server
middlewares []macaron.Handler middlewares []web.Handler
PluginContextProvider *plugincontext.Provider PluginContextProvider *plugincontext.Provider
RouteRegister routing.RouteRegister RouteRegister routing.RouteRegister
@ -136,8 +136,8 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
socialService social.Service, oauthTokenService oauthtoken.OAuthTokenService, socialService social.Service, oauthTokenService oauthtoken.OAuthTokenService,
encryptionService encryption.Service, searchUsersService searchusers.Service, encryptionService encryption.Service, searchUsersService searchusers.Service,
dataSourcesService *datasources.Service) (*HTTPServer, error) { dataSourcesService *datasources.Service) (*HTTPServer, error) {
macaron.Env = cfg.Env web.Env = cfg.Env
m := macaron.New() m := web.New()
hs := &HTTPServer{ hs := &HTTPServer{
Cfg: cfg, Cfg: cfg,
@ -177,7 +177,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
tracingService: tracingService, tracingService: tracingService,
internalMetricsSvc: internalMetricsSvc, internalMetricsSvc: internalMetricsSvc,
log: log.New("http.server"), log: log.New("http.server"),
macaron: m, web: m,
Listener: opts.Listener, Listener: opts.Listener,
SocialService: socialService, SocialService: socialService,
OAuthTokenService: oauthTokenService, OAuthTokenService: oauthTokenService,
@ -196,7 +196,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
return hs, nil return hs, nil
} }
func (hs *HTTPServer) AddMiddleware(middleware macaron.Handler) { func (hs *HTTPServer) AddMiddleware(middleware web.Handler) {
hs.middlewares = append(hs.middlewares, middleware) hs.middlewares = append(hs.middlewares, middleware)
} }
@ -209,7 +209,7 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
host := strings.TrimSuffix(strings.TrimPrefix(hs.Cfg.HTTPAddr, "["), "]") host := strings.TrimSuffix(strings.TrimPrefix(hs.Cfg.HTTPAddr, "["), "]")
hs.httpSrv = &http.Server{ hs.httpSrv = &http.Server{
Addr: net.JoinHostPort(host, hs.Cfg.HTTPPort), Addr: net.JoinHostPort(host, hs.Cfg.HTTPPort),
Handler: hs.macaron, Handler: hs.web,
ReadTimeout: hs.Cfg.ReadTimeout, ReadTimeout: hs.Cfg.ReadTimeout,
} }
switch hs.Cfg.Protocol { switch hs.Cfg.Protocol {
@ -386,15 +386,15 @@ func (hs *HTTPServer) applyRoutes() {
// start with middlewares & static routes // start with middlewares & static routes
hs.addMiddlewaresAndStaticRoutes() hs.addMiddlewaresAndStaticRoutes()
// then add view routes & api routes // then add view routes & api routes
hs.RouteRegister.Register(hs.macaron) hs.RouteRegister.Register(hs.web)
// then custom app proxy routes // then custom app proxy routes
hs.initAppPluginRoutes(hs.macaron) hs.initAppPluginRoutes(hs.web)
// lastly not found route // lastly not found route
hs.macaron.NotFound(middleware.ReqSignedIn, hs.NotFoundHandler) hs.web.NotFound(middleware.ReqSignedIn, hs.NotFoundHandler)
} }
func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() { func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
m := hs.macaron m := hs.web
m.Use(middleware.RequestTracing()) m.Use(middleware.RequestTracing())
@ -420,7 +420,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
m.SetURLPrefix(hs.Cfg.AppSubURL) m.SetURLPrefix(hs.Cfg.AppSubURL)
} }
m.UseMiddleware(macaron.Renderer(filepath.Join(hs.Cfg.StaticRootPath, "views"), "[[", "]]")) m.UseMiddleware(web.Renderer(filepath.Join(hs.Cfg.StaticRootPath, "views"), "[[", "]]"))
// These endpoints are used for monitoring the Grafana instance // These endpoints are used for monitoring the Grafana instance
// and should not be redirected or rejected. // and should not be redirected or rejected.
@ -444,7 +444,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
} }
} }
func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) { func (hs *HTTPServer) metricsEndpoint(ctx *web.Context) {
if !hs.Cfg.MetricsEndpointEnabled { if !hs.Cfg.MetricsEndpointEnabled {
return return
} }
@ -464,7 +464,7 @@ func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) {
} }
// healthzHandler always return 200 - Ok if Grafana's web server is running // healthzHandler always return 200 - Ok if Grafana's web server is running
func (hs *HTTPServer) healthzHandler(ctx *macaron.Context) { func (hs *HTTPServer) healthzHandler(ctx *web.Context) {
notHeadOrGet := ctx.Req.Method != http.MethodGet && ctx.Req.Method != http.MethodHead notHeadOrGet := ctx.Req.Method != http.MethodGet && ctx.Req.Method != http.MethodHead
if notHeadOrGet || ctx.Req.URL.Path != "/healthz" { if notHeadOrGet || ctx.Req.URL.Path != "/healthz" {
return return
@ -480,7 +480,7 @@ func (hs *HTTPServer) healthzHandler(ctx *macaron.Context) {
// apiHealthHandler will return ok if Grafana's web server is running and it // apiHealthHandler will return ok if Grafana's web server is running and it
// can access the database. If the database cannot be accessed it will return // can access the database. If the database cannot be accessed it will return
// http status code 503. // http status code 503.
func (hs *HTTPServer) apiHealthHandler(ctx *macaron.Context) { func (hs *HTTPServer) apiHealthHandler(ctx *web.Context) {
notHeadOrGet := ctx.Req.Method != http.MethodGet && ctx.Req.Method != http.MethodHead notHeadOrGet := ctx.Req.Method != http.MethodGet && ctx.Req.Method != http.MethodHead
if notHeadOrGet || ctx.Req.URL.Path != "/api/health" { if notHeadOrGet || ctx.Req.URL.Path != "/api/health" {
return return
@ -513,19 +513,19 @@ func (hs *HTTPServer) apiHealthHandler(ctx *macaron.Context) {
} }
} }
func (hs *HTTPServer) mapStatic(m *macaron.Macaron, rootDir string, dir string, prefix string) { func (hs *HTTPServer) mapStatic(m *web.Mux, rootDir string, dir string, prefix string) {
headers := func(c *macaron.Context) { headers := func(c *web.Context) {
c.Resp.Header().Set("Cache-Control", "public, max-age=3600") c.Resp.Header().Set("Cache-Control", "public, max-age=3600")
} }
if prefix == "public/build" { if prefix == "public/build" {
headers = func(c *macaron.Context) { headers = func(c *web.Context) {
c.Resp.Header().Set("Cache-Control", "public, max-age=31536000") c.Resp.Header().Set("Cache-Control", "public, max-age=31536000")
} }
} }
if hs.Cfg.Env == setting.Dev { if hs.Cfg.Env == setting.Dev {
headers = func(c *macaron.Context) { headers = func(c *web.Context) {
c.Resp.Header().Set("Cache-Control", "max-age=0, must-revalidate, no-cache") c.Resp.Header().Set("Cache-Control", "max-age=0, must-revalidate, no-cache")
} }
} }

4
pkg/api/ldap_debug.go
Unescape View File

@ -13,7 +13,7 @@ import (
"github.com/grafana/grafana/pkg/services/ldap" "github.com/grafana/grafana/pkg/services/ldap"
"github.com/grafana/grafana/pkg/services/multildap" "github.com/grafana/grafana/pkg/services/multildap"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var ( var (
@ -239,7 +239,7 @@ func (hs *HTTPServer) GetUserFromLDAP(c *models.ReqContext) response.Response {
ldap := newLDAP(ldapConfig.Servers) ldap := newLDAP(ldapConfig.Servers)
username := macaron.Params(c.Req)[":username"] username := web.Params(c.Req)[":username"]
if len(username) == 0 { if len(username) == 0 {
return response.Error(http.StatusBadRequest, "Validation error. You must specify an username", nil) return response.Error(http.StatusBadRequest, "Validation error. You must specify an username", nil)

4
pkg/api/login.go
Unescape View File

@ -19,7 +19,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util/errutil" "github.com/grafana/grafana/pkg/util/errutil"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
const ( const (
@ -173,7 +173,7 @@ func (hs *HTTPServer) LoginAPIPing(c *models.ReqContext) response.Response {
func (hs *HTTPServer) LoginPost(c *models.ReqContext) response.Response { func (hs *HTTPServer) LoginPost(c *models.ReqContext) response.Response {
cmd := dtos.LoginCommand{} cmd := dtos.LoginCommand{}
if err := macaron.Bind(c.Req, &cmd); err != nil { if err := web.Bind(c.Req, &cmd); err != nil {
return response.Error(http.StatusBadRequest, "bad login data", err) return response.Error(http.StatusBadRequest, "bad login data", err)
} }
authModule := "" authModule := ""

7
pkg/api/login_oauth.go
Unescape View File

@ -11,9 +11,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"golang.org/x/oauth2"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
@ -22,6 +19,8 @@ import (
"github.com/grafana/grafana/pkg/middleware/cookies" "github.com/grafana/grafana/pkg/middleware/cookies"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"golang.org/x/oauth2"
) )
var ( var (
@ -42,7 +41,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) {
loginInfo := models.LoginInfo{ loginInfo := models.LoginInfo{
AuthModule: "oauth", AuthModule: "oauth",
} }
name := macaron.Params(ctx.Req)[":name"] name := web.Params(ctx.Req)[":name"]
loginInfo.AuthModule = name loginInfo.AuthModule = name
provider := hs.SocialService.GetOAuthInfoProvider(name) provider := hs.SocialService.GetOAuthInfoProvider(name)
if provider == nil { if provider == nil {

4
pkg/api/org.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
// GET /api/org // GET /api/org
@ -25,7 +25,7 @@ func GetOrgByID(c *models.ReqContext) response.Response {
// Get /api/orgs/name/:name // Get /api/orgs/name/:name
func (hs *HTTPServer) GetOrgByName(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetOrgByName(c *models.ReqContext) response.Response {
org, err := hs.SQLStore.GetOrgByName(macaron.Params(c.Req)[":name"]) org, err := hs.SQLStore.GetOrgByName(web.Params(c.Req)[":name"])
if err != nil { if err != nil {
if errors.Is(err, models.ErrOrgNotFound) { if errors.Is(err, models.ErrOrgNotFound) {
return response.Error(404, "Organization not found", err) return response.Error(404, "Organization not found", err)

6
pkg/api/org_invite.go
Unescape View File

@ -12,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func GetPendingOrgInvites(c *models.ReqContext) response.Response { func GetPendingOrgInvites(c *models.ReqContext) response.Response {
@ -132,7 +132,7 @@ func inviteExistingUserToOrg(c *models.ReqContext, user *models.User, inviteDto
} }
func RevokeInvite(c *models.ReqContext) response.Response { func RevokeInvite(c *models.ReqContext) response.Response {
if ok, rsp := updateTempUserStatus(macaron.Params(c.Req)[":code"], models.TmpUserRevoked); !ok { if ok, rsp := updateTempUserStatus(web.Params(c.Req)[":code"], models.TmpUserRevoked); !ok {
return rsp return rsp
} }
@ -143,7 +143,7 @@ func RevokeInvite(c *models.ReqContext) response.Response {
// A response containing an InviteInfo object is returned if the invite is found. // A response containing an InviteInfo object is returned if the invite is found.
// If a (pending) invite is not found, 404 is returned. // If a (pending) invite is not found, 404 is returned.
func GetInviteInfoByCode(c *models.ReqContext) response.Response { func GetInviteInfoByCode(c *models.ReqContext) response.Response {
query := models.GetTempUserByCodeQuery{Code: macaron.Params(c.Req)[":code"]} query := models.GetTempUserByCodeQuery{Code: web.Params(c.Req)[":code"]}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
if errors.Is(err, models.ErrTempUserNotFound) { if errors.Is(err, models.ErrTempUserNotFound) {
return response.Error(404, "Invite not found", nil) return response.Error(404, "Invite not found", nil)

20
pkg/api/pluginproxy/ds_proxy_test.go
Unescape View File

@ -22,10 +22,10 @@ import (
"github.com/grafana/grafana/pkg/services/encryption/ossencryption" "github.com/grafana/grafana/pkg/services/encryption/ossencryption"
"github.com/grafana/grafana/pkg/services/oauthtoken" "github.com/grafana/grafana/pkg/services/oauthtoken"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/macaron.v1"
) )
func TestDataSourceProxy_routeRule(t *testing.T) { func TestDataSourceProxy_routeRule(t *testing.T) {
@ -114,7 +114,7 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
req, err := http.NewRequest("GET", "http://localhost/asd", nil) req, err := http.NewRequest("GET", "http://localhost/asd", nil)
require.NoError(t, err) require.NoError(t, err)
ctx := &models.ReqContext{ ctx := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR},
} }
return ctx, req return ctx, req
@ -255,7 +255,7 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
req, err := http.NewRequest("GET", "http://localhost/asd", nil) req, err := http.NewRequest("GET", "http://localhost/asd", nil)
require.NoError(t, err) require.NoError(t, err)
ctx := &models.ReqContext{ ctx := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR},
} }
@ -483,7 +483,7 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
ctx := &models.ReqContext{ ctx := &models.ReqContext{
SignedInUser: &models.SignedInUser{UserId: 1}, SignedInUser: &models.SignedInUser{UserId: 1},
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
} }
mockAuthToken := mockOAuthTokenService{ mockAuthToken := mockOAuthTokenService{
token: &oauth2.Token{ token: &oauth2.Token{
@ -600,7 +600,7 @@ func TestDataSourceProxy_requestHandling(t *testing.T) {
ds := &models.DataSource{Url: backend.URL, Type: models.DS_GRAPHITE} ds := &models.DataSource{Url: backend.URL, Type: models.DS_GRAPHITE}
responseWriter := macaron.NewResponseWriter("GET", httptest.NewRecorder()) responseWriter := web.NewResponseWriter("GET", httptest.NewRecorder())
// XXX: Really unsure why, but setting headers within the HTTP handler function doesn't stick, // XXX: Really unsure why, but setting headers within the HTTP handler function doesn't stick,
// so doing it here instead // so doing it here instead
@ -612,7 +612,7 @@ func TestDataSourceProxy_requestHandling(t *testing.T) {
return &models.ReqContext{ return &models.ReqContext{
SignedInUser: &models.SignedInUser{}, SignedInUser: &models.SignedInUser{},
Context: &macaron.Context{ Context: &web.Context{
Req: httptest.NewRequest("GET", "/render", nil), Req: httptest.NewRequest("GET", "/render", nil),
Resp: responseWriter, Resp: responseWriter,
}, },
@ -694,7 +694,7 @@ func TestDataSourceProxy_requestHandling(t *testing.T) {
func TestNewDataSourceProxy_InvalidURL(t *testing.T) { func TestNewDataSourceProxy_InvalidURL(t *testing.T) {
ctx := models.ReqContext{ ctx := models.ReqContext{
Context: &macaron.Context{}, Context: &web.Context{},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR},
} }
ds := models.DataSource{ ds := models.DataSource{
@ -711,7 +711,7 @@ func TestNewDataSourceProxy_InvalidURL(t *testing.T) {
func TestNewDataSourceProxy_ProtocolLessURL(t *testing.T) { func TestNewDataSourceProxy_ProtocolLessURL(t *testing.T) {
ctx := models.ReqContext{ ctx := models.ReqContext{
Context: &macaron.Context{}, Context: &web.Context{},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR},
} }
ds := models.DataSource{ ds := models.DataSource{
@ -730,7 +730,7 @@ func TestNewDataSourceProxy_ProtocolLessURL(t *testing.T) {
// Test wth MSSQL type data sources. // Test wth MSSQL type data sources.
func TestNewDataSourceProxy_MSSQL(t *testing.T) { func TestNewDataSourceProxy_MSSQL(t *testing.T) {
ctx := models.ReqContext{ ctx := models.ReqContext{
Context: &macaron.Context{}, Context: &web.Context{},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_EDITOR},
} }
tcs := []struct { tcs := []struct {
@ -939,7 +939,7 @@ func Test_PathCheck(t *testing.T) {
req, err := http.NewRequest("GET", "http://localhost/asd", nil) req, err := http.NewRequest("GET", "http://localhost/asd", nil)
require.NoError(t, err) require.NoError(t, err)
ctx := &models.ReqContext{ ctx := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_VIEWER}, SignedInUser: &models.SignedInUser{OrgRole: models.ROLE_VIEWER},
} }
return ctx, req return ctx, req

28
pkg/api/plugins.go
Unescape View File

@ -17,7 +17,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/backendplugin" "github.com/grafana/grafana/pkg/plugins/backendplugin"
"github.com/grafana/grafana/pkg/plugins/manager/installer" "github.com/grafana/grafana/pkg/plugins/manager/installer"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func (hs *HTTPServer) GetPluginList(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetPluginList(c *models.ReqContext) response.Response {
@ -101,7 +101,7 @@ func (hs *HTTPServer) GetPluginList(c *models.ReqContext) response.Response {
} }
func (hs *HTTPServer) GetPluginSettingByID(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetPluginSettingByID(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
def := hs.PluginManager.GetPlugin(pluginID) def := hs.PluginManager.GetPlugin(pluginID)
if def == nil { if def == nil {
@ -146,7 +146,7 @@ func (hs *HTTPServer) GetPluginSettingByID(c *models.ReqContext) response.Respon
} }
func (hs *HTTPServer) UpdatePluginSetting(c *models.ReqContext, cmd models.UpdatePluginSettingCmd) response.Response { func (hs *HTTPServer) UpdatePluginSetting(c *models.ReqContext, cmd models.UpdatePluginSettingCmd) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
if app := hs.PluginManager.GetApp(pluginID); app == nil { if app := hs.PluginManager.GetApp(pluginID); app == nil {
return response.Error(404, "Plugin not installed", nil) return response.Error(404, "Plugin not installed", nil)
@ -162,7 +162,7 @@ func (hs *HTTPServer) UpdatePluginSetting(c *models.ReqContext, cmd models.Updat
} }
func (hs *HTTPServer) GetPluginDashboards(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetPluginDashboards(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
list, err := hs.PluginManager.GetPluginDashboards(c.OrgId, pluginID) list, err := hs.PluginManager.GetPluginDashboards(c.OrgId, pluginID)
if err != nil { if err != nil {
@ -178,8 +178,8 @@ func (hs *HTTPServer) GetPluginDashboards(c *models.ReqContext) response.Respons
} }
func (hs *HTTPServer) GetPluginMarkdown(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetPluginMarkdown(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
name := macaron.Params(c.Req)[":name"] name := web.Params(c.Req)[":name"]
content, err := hs.PluginManager.GetPluginMarkdown(pluginID, name) content, err := hs.PluginManager.GetPluginMarkdown(pluginID, name)
if err != nil { if err != nil {
@ -241,7 +241,7 @@ func (hs *HTTPServer) ImportDashboard(c *models.ReqContext, apiCmd dtos.ImportDa
// //
// /api/plugins/:pluginId/metrics // /api/plugins/:pluginId/metrics
func (hs *HTTPServer) CollectPluginMetrics(c *models.ReqContext) response.Response { func (hs *HTTPServer) CollectPluginMetrics(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
plugin := hs.PluginManager.GetPlugin(pluginID) plugin := hs.PluginManager.GetPlugin(pluginID)
if plugin == nil { if plugin == nil {
return response.Error(404, "Plugin not found", nil) return response.Error(404, "Plugin not found", nil)
@ -262,14 +262,14 @@ func (hs *HTTPServer) CollectPluginMetrics(c *models.ReqContext) response.Respon
// //
// /public/plugins/:pluginId/* // /public/plugins/:pluginId/*
func (hs *HTTPServer) getPluginAssets(c *models.ReqContext) { func (hs *HTTPServer) getPluginAssets(c *models.ReqContext) {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
plugin := hs.PluginManager.GetPlugin(pluginID) plugin := hs.PluginManager.GetPlugin(pluginID)
if plugin == nil { if plugin == nil {
c.JsonApiErr(404, "Plugin not found", nil) c.JsonApiErr(404, "Plugin not found", nil)
return return
} }
requestedFile := filepath.Clean(macaron.Params(c.Req)["*"]) requestedFile := filepath.Clean(web.Params(c.Req)["*"])
pluginFilePath := filepath.Join(plugin.PluginDir, requestedFile) pluginFilePath := filepath.Join(plugin.PluginDir, requestedFile)
if !plugin.IncludedInSignature(requestedFile) { if !plugin.IncludedInSignature(requestedFile) {
@ -313,7 +313,7 @@ func (hs *HTTPServer) getPluginAssets(c *models.ReqContext) {
// CheckHealth returns the health of a plugin. // CheckHealth returns the health of a plugin.
// /api/plugins/:pluginId/health // /api/plugins/:pluginId/health
func (hs *HTTPServer) CheckHealth(c *models.ReqContext) response.Response { func (hs *HTTPServer) CheckHealth(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
pCtx, found, err := hs.PluginContextProvider.Get(pluginID, "", c.SignedInUser, false) pCtx, found, err := hs.PluginContextProvider.Get(pluginID, "", c.SignedInUser, false)
if err != nil { if err != nil {
@ -355,7 +355,7 @@ func (hs *HTTPServer) CheckHealth(c *models.ReqContext) response.Response {
// //
// /api/plugins/:pluginId/resources/* // /api/plugins/:pluginId/resources/*
func (hs *HTTPServer) CallResource(c *models.ReqContext) { func (hs *HTTPServer) CallResource(c *models.ReqContext) {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
pCtx, found, err := hs.PluginContextProvider.Get(pluginID, "", c.SignedInUser, false) pCtx, found, err := hs.PluginContextProvider.Get(pluginID, "", c.SignedInUser, false)
if err != nil { if err != nil {
@ -366,7 +366,7 @@ func (hs *HTTPServer) CallResource(c *models.ReqContext) {
c.JsonApiErr(404, "Plugin not found", nil) c.JsonApiErr(404, "Plugin not found", nil)
return return
} }
hs.BackendPluginManager.CallResource(pCtx, c, macaron.Params(c.Req)["*"]) hs.BackendPluginManager.CallResource(pCtx, c, web.Params(c.Req)["*"])
} }
func (hs *HTTPServer) GetPluginErrorsList(_ *models.ReqContext) response.Response { func (hs *HTTPServer) GetPluginErrorsList(_ *models.ReqContext) response.Response {
@ -374,7 +374,7 @@ func (hs *HTTPServer) GetPluginErrorsList(_ *models.ReqContext) response.Respons
} }
func (hs *HTTPServer) InstallPlugin(c *models.ReqContext, dto dtos.InstallPluginCommand) response.Response { func (hs *HTTPServer) InstallPlugin(c *models.ReqContext, dto dtos.InstallPluginCommand) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
err := hs.PluginManager.Install(c.Req.Context(), pluginID, dto.Version) err := hs.PluginManager.Install(c.Req.Context(), pluginID, dto.Version)
if err != nil { if err != nil {
@ -405,7 +405,7 @@ func (hs *HTTPServer) InstallPlugin(c *models.ReqContext, dto dtos.InstallPlugin
} }
func (hs *HTTPServer) UninstallPlugin(c *models.ReqContext) response.Response { func (hs *HTTPServer) UninstallPlugin(c *models.ReqContext) response.Response {
pluginID := macaron.Params(c.Req)[":pluginId"] pluginID := web.Params(c.Req)[":pluginId"]
err := hs.PluginManager.Uninstall(c.Req.Context(), pluginID) err := hs.PluginManager.Uninstall(c.Req.Context(), pluginID)
if err != nil { if err != nil {

6
pkg/api/quota.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func GetOrgQuotas(c *models.ReqContext) response.Response { func GetOrgQuotas(c *models.ReqContext) response.Response {
@ -26,7 +26,7 @@ func UpdateOrgQuota(c *models.ReqContext, cmd models.UpdateOrgQuotaCmd) response
return response.Error(404, "Quotas not enabled", nil) return response.Error(404, "Quotas not enabled", nil)
} }
cmd.OrgId = c.ParamsInt64(":orgId") cmd.OrgId = c.ParamsInt64(":orgId")
cmd.Target = macaron.Params(c.Req)[":target"] cmd.Target = web.Params(c.Req)[":target"]
if _, ok := setting.Quota.Org.ToMap()[cmd.Target]; !ok { if _, ok := setting.Quota.Org.ToMap()[cmd.Target]; !ok {
return response.Error(404, "Invalid quota target", nil) return response.Error(404, "Invalid quota target", nil)
@ -56,7 +56,7 @@ func UpdateUserQuota(c *models.ReqContext, cmd models.UpdateUserQuotaCmd) respon
return response.Error(404, "Quotas not enabled", nil) return response.Error(404, "Quotas not enabled", nil)
} }
cmd.UserId = c.ParamsInt64(":id") cmd.UserId = c.ParamsInt64(":id")
cmd.Target = macaron.Params(c.Req)[":target"] cmd.Target = web.Params(c.Req)[":target"]
if _, ok := setting.Quota.User.ToMap()[cmd.Target]; !ok { if _, ok := setting.Quota.User.ToMap()[cmd.Target]; !ok {
return response.Error(404, "Invalid quota target", nil) return response.Error(404, "Invalid quota target", nil)

4
pkg/api/render.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func (hs *HTTPServer) RenderToPng(c *models.ReqContext) { func (hs *HTTPServer) RenderToPng(c *models.ReqContext) {
@ -59,7 +59,7 @@ func (hs *HTTPServer) RenderToPng(c *models.ReqContext) {
OrgID: c.OrgId, OrgID: c.OrgId,
UserID: c.UserId, UserID: c.UserId,
OrgRole: c.OrgRole, OrgRole: c.OrgRole,
Path: macaron.Params(c.Req)["*"] + queryParams, Path: web.Params(c.Req)["*"] + queryParams,
Timezone: queryReader.Get("tz", ""), Timezone: queryReader.Get("tz", ""),
Encoding: queryReader.Get("encoding", ""), Encoding: queryReader.Get("encoding", ""),
ConcurrentLimit: hs.Cfg.RendererConcurrentRequestLimit, ConcurrentLimit: hs.Cfg.RendererConcurrentRequestLimit,

52
pkg/api/routing/route_register.go
Unescape View File

@ -6,41 +6,41 @@ import (
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
type Router interface { type Router interface {
Handle(method, pattern string, handlers []macaron.Handler) Handle(method, pattern string, handlers []web.Handler)
Get(pattern string, handlers ...macaron.Handler) Get(pattern string, handlers ...web.Handler)
} }
// RouteRegister allows you to add routes and macaron.Handlers // RouteRegister allows you to add routes and web.Handlers
// that the web server should serve. // that the web server should serve.
type RouteRegister interface { type RouteRegister interface {
// Get adds a list of handlers to a given route with a GET HTTP verb // Get adds a list of handlers to a given route with a GET HTTP verb
Get(string, ...macaron.Handler) Get(string, ...web.Handler)
// Post adds a list of handlers to a given route with a POST HTTP verb // Post adds a list of handlers to a given route with a POST HTTP verb
Post(string, ...macaron.Handler) Post(string, ...web.Handler)
// Delete adds a list of handlers to a given route with a DELETE HTTP verb // Delete adds a list of handlers to a given route with a DELETE HTTP verb
Delete(string, ...macaron.Handler) Delete(string, ...web.Handler)
// Put adds a list of handlers to a given route with a PUT HTTP verb // Put adds a list of handlers to a given route with a PUT HTTP verb
Put(string, ...macaron.Handler) Put(string, ...web.Handler)
// Patch adds a list of handlers to a given route with a PATCH HTTP verb // Patch adds a list of handlers to a given route with a PATCH HTTP verb
Patch(string, ...macaron.Handler) Patch(string, ...web.Handler)
// Any adds a list of handlers to a given route with any HTTP verb // Any adds a list of handlers to a given route with any HTTP verb
Any(string, ...macaron.Handler) Any(string, ...web.Handler)
// Group allows you to pass a function that can add multiple routes // Group allows you to pass a function that can add multiple routes
// with a shared prefix route. // with a shared prefix route.
Group(string, func(RouteRegister), ...macaron.Handler) Group(string, func(RouteRegister), ...web.Handler)
// Insert adds more routes to an existing Group. // Insert adds more routes to an existing Group.
Insert(string, func(RouteRegister), ...macaron.Handler) Insert(string, func(RouteRegister), ...web.Handler)
// Register iterates over all routes added to the RouteRegister // Register iterates over all routes added to the RouteRegister
// and add them to the `Router` pass as an parameter. // and add them to the `Router` pass as an parameter.
@ -50,7 +50,7 @@ type RouteRegister interface {
Reset() Reset()
} }
type RegisterNamedMiddleware func(name string) macaron.Handler type RegisterNamedMiddleware func(name string) web.Handler
func ProvideRegister(cfg *setting.Cfg) *RouteRegisterImpl { func ProvideRegister(cfg *setting.Cfg) *RouteRegisterImpl {
return NewRouteRegister(middleware.ProvideRouteOperationName, middleware.RequestMetrics(cfg)) return NewRouteRegister(middleware.ProvideRouteOperationName, middleware.RequestMetrics(cfg))
@ -61,7 +61,7 @@ func NewRouteRegister(namedMiddlewares ...RegisterNamedMiddleware) *RouteRegiste
return &RouteRegisterImpl{ return &RouteRegisterImpl{
prefix: "", prefix: "",
routes: []route{}, routes: []route{},
subfixHandlers: []macaron.Handler{}, subfixHandlers: []web.Handler{},
namedMiddlewares: namedMiddlewares, namedMiddlewares: namedMiddlewares,
} }
} }
@ -69,12 +69,12 @@ func NewRouteRegister(namedMiddlewares ...RegisterNamedMiddleware) *RouteRegiste
type route struct { type route struct {
method string method string
pattern string pattern string
handlers []macaron.Handler handlers []web.Handler
} }
type RouteRegisterImpl struct { type RouteRegisterImpl struct {
prefix string prefix string
subfixHandlers []macaron.Handler subfixHandlers []web.Handler
namedMiddlewares []RegisterNamedMiddleware namedMiddlewares []RegisterNamedMiddleware
routes []route routes []route
groups []*RouteRegisterImpl groups []*RouteRegisterImpl
@ -90,7 +90,7 @@ func (rr *RouteRegisterImpl) Reset() {
rr.subfixHandlers = nil rr.subfixHandlers = nil
} }
func (rr *RouteRegisterImpl) Insert(pattern string, fn func(RouteRegister), handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Insert(pattern string, fn func(RouteRegister), handlers ...web.Handler) {
// loop over all groups at current level // loop over all groups at current level
for _, g := range rr.groups { for _, g := range rr.groups {
// apply routes if the prefix matches the pattern // apply routes if the prefix matches the pattern
@ -106,7 +106,7 @@ func (rr *RouteRegisterImpl) Insert(pattern string, fn func(RouteRegister), hand
} }
} }
func (rr *RouteRegisterImpl) Group(pattern string, fn func(rr RouteRegister), handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Group(pattern string, fn func(rr RouteRegister), handlers ...web.Handler) {
group := &RouteRegisterImpl{ group := &RouteRegisterImpl{
prefix: rr.prefix + pattern, prefix: rr.prefix + pattern,
subfixHandlers: append(rr.subfixHandlers, handlers...), subfixHandlers: append(rr.subfixHandlers, handlers...),
@ -135,8 +135,8 @@ func (rr *RouteRegisterImpl) Register(router Router) {
} }
} }
func (rr *RouteRegisterImpl) route(pattern, method string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) route(pattern, method string, handlers ...web.Handler) {
h := make([]macaron.Handler, 0) h := make([]web.Handler, 0)
fullPattern := rr.prefix + pattern fullPattern := rr.prefix + pattern
for _, fn := range rr.namedMiddlewares { for _, fn := range rr.namedMiddlewares {
@ -159,26 +159,26 @@ func (rr *RouteRegisterImpl) route(pattern, method string, handlers ...macaron.H
}) })
} }
func (rr *RouteRegisterImpl) Get(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Get(pattern string, handlers ...web.Handler) {
rr.route(pattern, http.MethodGet, handlers...) rr.route(pattern, http.MethodGet, handlers...)
} }
func (rr *RouteRegisterImpl) Post(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Post(pattern string, handlers ...web.Handler) {
rr.route(pattern, http.MethodPost, handlers...) rr.route(pattern, http.MethodPost, handlers...)
} }
func (rr *RouteRegisterImpl) Delete(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Delete(pattern string, handlers ...web.Handler) {
rr.route(pattern, http.MethodDelete, handlers...) rr.route(pattern, http.MethodDelete, handlers...)
} }
func (rr *RouteRegisterImpl) Put(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Put(pattern string, handlers ...web.Handler) {
rr.route(pattern, http.MethodPut, handlers...) rr.route(pattern, http.MethodPut, handlers...)
} }
func (rr *RouteRegisterImpl) Patch(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Patch(pattern string, handlers ...web.Handler) {
rr.route(pattern, http.MethodPatch, handlers...) rr.route(pattern, http.MethodPatch, handlers...)
} }
func (rr *RouteRegisterImpl) Any(pattern string, handlers ...macaron.Handler) { func (rr *RouteRegisterImpl) Any(pattern string, handlers ...web.Handler) {
rr.route(pattern, "*", handlers...) rr.route(pattern, "*", handlers...)
} }

14
pkg/api/routing/route_register_test.go
Unescape View File

@ -5,14 +5,14 @@ import (
"strconv" "strconv"
"testing" "testing"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
type fakeRouter struct { type fakeRouter struct {
route []route route []route
} }
func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler) { func (fr *fakeRouter) Handle(method, pattern string, handlers []web.Handler) {
fr.route = append(fr.route, route{ fr.route = append(fr.route, route{
pattern: pattern, pattern: pattern,
method: method, method: method,
@ -20,7 +20,7 @@ func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler)
}) })
} }
func (fr *fakeRouter) Get(pattern string, handlers ...macaron.Handler) { func (fr *fakeRouter) Get(pattern string, handlers ...web.Handler) {
fr.route = append(fr.route, route{ fr.route = append(fr.route, route{
pattern: pattern, pattern: pattern,
method: http.MethodGet, method: http.MethodGet,
@ -28,15 +28,15 @@ func (fr *fakeRouter) Get(pattern string, handlers ...macaron.Handler) {
}) })
} }
func emptyHandlers(n int) []macaron.Handler { func emptyHandlers(n int) []web.Handler {
var res []macaron.Handler var res []web.Handler
for i := 1; n >= i; i++ { for i := 1; n >= i; i++ {
res = append(res, emptyHandler(strconv.Itoa(i))) res = append(res, emptyHandler(strconv.Itoa(i)))
} }
return res return res
} }
func emptyHandler(name string) macaron.Handler { func emptyHandler(name string) web.Handler {
return struct{ name string }{name: name} return struct{ name string }{name: name}
} }
@ -212,7 +212,7 @@ func TestNamedMiddlewareRouteRegister(t *testing.T) {
namedMiddlewares := map[string]bool{} namedMiddlewares := map[string]bool{}
// Setup // Setup
rr := NewRouteRegister(func(name string) macaron.Handler { rr := NewRouteRegister(func(name string) web.Handler {
namedMiddlewares[name] = true namedMiddlewares[name] = true
return struct{ name string }{name: name} return struct{ name string }{name: name}

4
pkg/api/routing/routing.go
Unescape View File

@ -3,7 +3,7 @@ package routing
import ( import (
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var ( var (
@ -12,7 +12,7 @@ var (
} }
) )
func Wrap(action interface{}) macaron.Handler { func Wrap(action interface{}) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
var res response.Response var res response.Response
val, err := c.Invoke(action) val, err := c.Invoke(action)

4
pkg/api/short_url.go
Unescape View File

@ -11,7 +11,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
// createShortURL handles requests to create short URLs. // createShortURL handles requests to create short URLs.
@ -46,7 +46,7 @@ func (hs *HTTPServer) createShortURL(c *models.ReqContext, cmd dtos.CreateShortU
} }
func (hs *HTTPServer) redirectFromShortURL(c *models.ReqContext) { func (hs *HTTPServer) redirectFromShortURL(c *models.ReqContext) {
shortURLUID := macaron.Params(c.Req)[":uid"] shortURLUID := web.Params(c.Req)[":uid"]
if !util.IsValidShortUID(shortURLUID) { if !util.IsValidShortUID(shortURLUID) {
return return

12
pkg/api/static/static.go
Unescape View File

@ -26,7 +26,7 @@ import (
"sync" "sync"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var Root string var Root string
@ -39,7 +39,7 @@ func init() {
} }
} }
// StaticOptions is a struct for specifying configuration options for the macaron.Static middleware. // StaticOptions is a struct for specifying configuration options for the web.Static middleware.
type StaticOptions struct { type StaticOptions struct {
// Prefix is the optional prefix used to serve the static directory content // Prefix is the optional prefix used to serve the static directory content
Prefix string Prefix string
@ -49,7 +49,7 @@ type StaticOptions struct {
IndexFile string IndexFile string
// Expires defines which user-defined function to use for producing a HTTP Expires Header // Expires defines which user-defined function to use for producing a HTTP Expires Header
// https://developers.google.com/speed/docs/insights/LeverageBrowserCaching // https://developers.google.com/speed/docs/insights/LeverageBrowserCaching
AddHeaders func(ctx *macaron.Context) AddHeaders func(ctx *web.Context)
// FileSystem is the interface for supporting any implementation of file system. // FileSystem is the interface for supporting any implementation of file system.
FileSystem http.FileSystem FileSystem http.FileSystem
} }
@ -115,7 +115,7 @@ func prepareStaticOptions(dir string, options []StaticOptions) StaticOptions {
return prepareStaticOption(dir, opt) return prepareStaticOption(dir, opt)
} }
func staticHandler(ctx *macaron.Context, log log.Logger, opt StaticOptions) bool { func staticHandler(ctx *web.Context, log log.Logger, opt StaticOptions) bool {
if ctx.Req.Method != "GET" && ctx.Req.Method != "HEAD" { if ctx.Req.Method != "GET" && ctx.Req.Method != "HEAD" {
return false return false
} }
@ -195,11 +195,11 @@ func staticHandler(ctx *macaron.Context, log log.Logger, opt StaticOptions) bool
} }
// Static returns a middleware handler that serves static files in the given directory. // Static returns a middleware handler that serves static files in the given directory.
func Static(directory string, staticOpt ...StaticOptions) macaron.Handler { func Static(directory string, staticOpt ...StaticOptions) web.Handler {
opt := prepareStaticOptions(directory, staticOpt) opt := prepareStaticOptions(directory, staticOpt)
logger := log.New("static") logger := log.New("static")
return func(ctx *macaron.Context) { return func(ctx *web.Context) {
staticHandler(ctx, logger, opt) staticHandler(ctx, logger, opt)
} }
} }

11
pkg/api/team_test.go
Unescape View File

@ -3,13 +3,12 @@ package api
import ( import (
"testing" "testing"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"net/http" "net/http"
@ -126,7 +125,7 @@ func TestTeamAPIEndpoint(t *testing.T) {
t.Run("with no real signed in user", func(t *testing.T) { t.Run("with no real signed in user", func(t *testing.T) {
stub := &testLogger{} stub := &testLogger{}
c := &models.ReqContext{ c := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
SignedInUser: &models.SignedInUser{}, SignedInUser: &models.SignedInUser{},
Logger: stub, Logger: stub,
} }
@ -142,7 +141,7 @@ func TestTeamAPIEndpoint(t *testing.T) {
t.Run("with real signed in user", func(t *testing.T) { t.Run("with real signed in user", func(t *testing.T) {
stub := &testLogger{} stub := &testLogger{}
c := &models.ReqContext{ c := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
SignedInUser: &models.SignedInUser{UserId: 42}, SignedInUser: &models.SignedInUser{UserId: 42},
Logger: stub, Logger: stub,
} }

6
pkg/macaron/macaron.go
Unescape View File

@ -16,7 +16,7 @@
// under the License. // under the License.
// Package macaron is a high productive and modular web framework in Go. // Package macaron is a high productive and modular web framework in Go.
package macaron // import "gopkg.in/macaron.v1" package macaron // import "gopkg.in/web.v1"
import ( import (
"context" "context"
@ -107,7 +107,7 @@ func New() *Macaron {
// Macaron stops future process when it returns true. // Macaron stops future process when it returns true.
type BeforeHandler func(rw http.ResponseWriter, req *http.Request) bool type BeforeHandler func(rw http.ResponseWriter, req *http.Request) bool
// macaronContextKey is used to store/fetch macaron.Context inside context.Context // macaronContextKey is used to store/fetch web.Context inside context.Context
type macaronContextKey struct{} type macaronContextKey struct{}
// FromContext returns the macaron context stored in a context.Context, if any. // FromContext returns the macaron context stored in a context.Context, if any.
@ -137,7 +137,7 @@ func SetURLParams(r *http.Request, vars map[string]string) *http.Request {
// A middleware is a function that has a reference to the next handler in the chain // A middleware is a function that has a reference to the next handler in the chain
// and returns the actual middleware handler, that may do its job and optionally // and returns the actual middleware handler, that may do its job and optionally
// call next. // call next.
// Due to how Macaron handles/injects requests and responses we patch the macaron.Context // Due to how Macaron handles/injects requests and responses we patch the web.Context
// to use the new ResponseWriter and http.Request here. The caller may only call // to use the new ResponseWriter and http.Request here. The caller may only call
// `next.ServeHTTP(rw, req)` to pass a modified response writer and/or a request to the // `next.ServeHTTP(rw, req)` to pass a modified response writer and/or a request to the
// further middlewares in the chain. // further middlewares in the chain.

13
pkg/middleware/auth.go
Unescape View File

@ -7,12 +7,11 @@ import (
"strconv" "strconv"
"strings" "strings"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/middleware/cookies" "github.com/grafana/grafana/pkg/middleware/cookies"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
) )
type AuthOptions struct { type AuthOptions struct {
@ -80,7 +79,7 @@ func EnsureEditorOrViewerCanEdit(c *models.ReqContext) {
} }
} }
func RoleAuth(roles ...models.RoleType) macaron.Handler { func RoleAuth(roles ...models.RoleType) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
ok := false ok := false
for _, role := range roles { for _, role := range roles {
@ -95,7 +94,7 @@ func RoleAuth(roles ...models.RoleType) macaron.Handler {
} }
} }
func Auth(options *AuthOptions) macaron.Handler { func Auth(options *AuthOptions) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
forceLogin := false forceLogin := false
if c.AllowAnonymous { if c.AllowAnonymous {
@ -134,7 +133,7 @@ func Auth(options *AuthOptions) macaron.Handler {
// feature flag is enabled. // feature flag is enabled.
// Intended for when feature flags open up access to APIs that // Intended for when feature flags open up access to APIs that
// are otherwise only available to admins. // are otherwise only available to admins.
func AdminOrFeatureEnabled(enabled bool) macaron.Handler { func AdminOrFeatureEnabled(enabled bool) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
if c.OrgRole == models.ROLE_ADMIN { if c.OrgRole == models.ROLE_ADMIN {
return return
@ -148,7 +147,7 @@ func AdminOrFeatureEnabled(enabled bool) macaron.Handler {
// SnapshotPublicModeOrSignedIn creates a middleware that allows access // SnapshotPublicModeOrSignedIn creates a middleware that allows access
// if snapshot public mode is enabled or if user is signed in. // if snapshot public mode is enabled or if user is signed in.
func SnapshotPublicModeOrSignedIn(cfg *setting.Cfg) macaron.Handler { func SnapshotPublicModeOrSignedIn(cfg *setting.Cfg) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
if cfg.SnapshotPublicMode { if cfg.SnapshotPublicMode {
return return
@ -169,7 +168,7 @@ func ReqNotSignedIn(c *models.ReqContext) {
// NoAuth creates a middleware that doesn't require any authentication. // NoAuth creates a middleware that doesn't require any authentication.
// If forceLogin param is set it will redirect the user to the login page. // If forceLogin param is set it will redirect the user to the login page.
func NoAuth() macaron.Handler { func NoAuth() web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
if shouldForceLogin(c) { if shouldForceLogin(c) {
notAuthorized(c) notAuthorized(c)

6
pkg/middleware/gziper.go
Unescape View File

@ -8,12 +8,12 @@ import (
"net/http" "net/http"
"strings" "strings"
macaron "gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
type gzipResponseWriter struct { type gzipResponseWriter struct {
w *gzip.Writer w *gzip.Writer
macaron.ResponseWriter web.ResponseWriter
} }
func (grw *gzipResponseWriter) WriteHeader(c int) { func (grw *gzipResponseWriter) WriteHeader(c int) {
@ -68,7 +68,7 @@ func Gziper() func(http.Handler) http.Handler {
return return
} }
grw := &gzipResponseWriter{gzip.NewWriter(rw), rw.(macaron.ResponseWriter)} grw := &gzipResponseWriter{gzip.NewWriter(rw), rw.(web.ResponseWriter)}
grw.Header().Set("Content-Encoding", "gzip") grw.Header().Set("Content-Encoding", "gzip")
grw.Header().Set("Vary", "Accept-Encoding") grw.Header().Set("Vary", "Accept-Encoding")

8
pkg/middleware/logger.go
Unescape View File

@ -21,15 +21,15 @@ import (
"github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/contexthandler"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
cw "github.com/weaveworks/common/middleware" cw "github.com/weaveworks/common/middleware"
"gopkg.in/macaron.v1"
) )
func Logger(cfg *setting.Cfg) macaron.Handler { func Logger(cfg *setting.Cfg) web.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { return func(res http.ResponseWriter, req *http.Request, c *web.Context) {
start := time.Now() start := time.Now()
rw := res.(macaron.ResponseWriter) rw := res.(web.ResponseWriter)
c.Next() c.Next()
timeTaken := time.Since(start) / time.Millisecond timeTaken := time.Since(start) / time.Millisecond

15
pkg/middleware/middleware.go
Unescape View File

@ -4,10 +4,9 @@ import (
"fmt" "fmt"
"strings" "strings"
macaron "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
) )
var ( var (
@ -25,9 +24,9 @@ func HandleNoCacheHeader(ctx *models.ReqContext) {
ctx.SkipCache = ctx.Req.Header.Get("X-Grafana-NoCache") == "true" ctx.SkipCache = ctx.Req.Header.Get("X-Grafana-NoCache") == "true"
} }
func AddDefaultResponseHeaders(cfg *setting.Cfg) macaron.Handler { func AddDefaultResponseHeaders(cfg *setting.Cfg) web.Handler {
return func(c *macaron.Context) { return func(c *web.Context) {
c.Resp.Before(func(w macaron.ResponseWriter) { c.Resp.Before(func(w web.ResponseWriter) {
// if response has already been written, skip. // if response has already been written, skip.
if w.Written() { if w.Written() {
return return
@ -47,7 +46,7 @@ func AddDefaultResponseHeaders(cfg *setting.Cfg) macaron.Handler {
} }
// addSecurityHeaders adds HTTP(S) response headers that enable various security protections in the client's browser. // addSecurityHeaders adds HTTP(S) response headers that enable various security protections in the client's browser.
func addSecurityHeaders(w macaron.ResponseWriter, cfg *setting.Cfg) { func addSecurityHeaders(w web.ResponseWriter, cfg *setting.Cfg) {
if (cfg.Protocol == setting.HTTPSScheme || cfg.Protocol == setting.HTTP2Scheme) && cfg.StrictTransportSecurity { if (cfg.Protocol == setting.HTTPSScheme || cfg.Protocol == setting.HTTP2Scheme) && cfg.StrictTransportSecurity {
strictHeaderValues := []string{fmt.Sprintf("max-age=%v", cfg.StrictTransportSecurityMaxAge)} strictHeaderValues := []string{fmt.Sprintf("max-age=%v", cfg.StrictTransportSecurityMaxAge)}
if cfg.StrictTransportSecurityPreload { if cfg.StrictTransportSecurityPreload {
@ -68,12 +67,12 @@ func addSecurityHeaders(w macaron.ResponseWriter, cfg *setting.Cfg) {
} }
} }
func addNoCacheHeaders(w macaron.ResponseWriter) { func addNoCacheHeaders(w web.ResponseWriter) {
w.Header().Set("Cache-Control", "no-cache") w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Pragma", "no-cache") w.Header().Set("Pragma", "no-cache")
w.Header().Set("Expires", "-1") w.Header().Set("Expires", "-1")
} }
func addXFrameOptionsDenyHeader(w macaron.ResponseWriter) { func addXFrameOptionsDenyHeader(w web.ResponseWriter) {
w.Header().Set("X-Frame-Options", "deny") w.Header().Set("X-Frame-Options", "deny")
} }

11
pkg/middleware/middleware_test.go
Unescape View File

@ -11,10 +11,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
@ -30,6 +26,9 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func fakeGetTime() func() time.Time { func fakeGetTime() func() time.Time {
@ -628,10 +627,10 @@ func middlewareScenario(t *testing.T, desc string, fn scenarioFunc, cbs ...func(
require.NoError(t, err) require.NoError(t, err)
require.Truef(t, exists, "Views directory should exist at %q", viewsPath) require.Truef(t, exists, "Views directory should exist at %q", viewsPath)
sc.m = macaron.New() sc.m = web.New()
sc.m.Use(AddDefaultResponseHeaders(cfg)) sc.m.Use(AddDefaultResponseHeaders(cfg))
sc.m.UseMiddleware(AddCSPHeader(cfg, logger)) sc.m.UseMiddleware(AddCSPHeader(cfg, logger))
sc.m.UseMiddleware(macaron.Renderer(viewsPath, "[[", "]]")) sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
ctxHdlr := getContextHandler(t, cfg) ctxHdlr := getContextHandler(t, cfg)
sc.sqlStore = ctxHdlr.SQLStore sc.sqlStore = ctxHdlr.SQLStore

6
pkg/middleware/org_redirect.go
Unescape View File

@ -10,13 +10,13 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/contexthandler"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
// OrgRedirect changes org and redirects users if the // OrgRedirect changes org and redirects users if the
// querystring `orgId` doesn't match the active org. // querystring `orgId` doesn't match the active org.
func OrgRedirect(cfg *setting.Cfg) macaron.Handler { func OrgRedirect(cfg *setting.Cfg) web.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { return func(res http.ResponseWriter, req *http.Request, c *web.Context) {
orgIdValue := req.URL.Query().Get("orgId") orgIdValue := req.URL.Query().Get("orgId")
orgId, err := strconv.ParseInt(orgIdValue, 10, 64) orgId, err := strconv.ParseInt(orgIdValue, 10, 64)

7
pkg/middleware/quota.go
Unescape View File

@ -3,19 +3,18 @@ package middleware
import ( import (
"fmt" "fmt"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/quota" "github.com/grafana/grafana/pkg/services/quota"
"github.com/grafana/grafana/pkg/web"
) )
// Quota returns a function that returns a function used to call quotaservice based on target name // Quota returns a function that returns a function used to call quotaservice based on target name
func Quota(quotaService *quota.QuotaService) func(string) macaron.Handler { func Quota(quotaService *quota.QuotaService) func(string) web.Handler {
if quotaService == nil { if quotaService == nil {
panic("quotaService is nil") panic("quotaService is nil")
} }
//https://open.spotify.com/track/7bZSoBEAEEUsGEuLOf94Jm?si=T1Tdju5qRSmmR0zph_6RBw fuuuuunky //https://open.spotify.com/track/7bZSoBEAEEUsGEuLOf94Jm?si=T1Tdju5qRSmmR0zph_6RBw fuuuuunky
return func(target string) macaron.Handler { return func(target string) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
limitReached, err := quotaService.QuotaReached(c, target) limitReached, err := quotaService.QuotaReached(c, target)
if err != nil { if err != nil {

4
pkg/middleware/quota_test.go
Unescape View File

@ -9,8 +9,8 @@ import (
"github.com/grafana/grafana/pkg/services/auth" "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/quota" "github.com/grafana/grafana/pkg/services/quota"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
macaron "gopkg.in/macaron.v1"
) )
func TestMiddlewareQuota(t *testing.T) { func TestMiddlewareQuota(t *testing.T) {
@ -266,7 +266,7 @@ func TestMiddlewareQuota(t *testing.T) {
}) })
} }
func getQuotaHandler(sc *scenarioContext, target string) macaron.Handler { func getQuotaHandler(sc *scenarioContext, target string) web.Handler {
fakeAuthTokenService := auth.NewFakeUserAuthTokenService() fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
qs := &quota.QuotaService{ qs := &quota.QuotaService{
AuthTokenService: fakeAuthTokenService, AuthTokenService: fakeAuthTokenService,

7
pkg/middleware/rate_limit.go
Unescape View File

@ -3,10 +3,9 @@ package middleware
import ( import (
"time" "time"
"golang.org/x/time/rate"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/web"
"golang.org/x/time/rate"
) )
type getTimeFn func() time.Time type getTimeFn func() time.Time
@ -14,7 +13,7 @@ type getTimeFn func() time.Time
// RateLimit is a very basic rate limiter. // RateLimit is a very basic rate limiter.
// Will allow average of "rps" requests per second over an extended period of time, with max "burst" requests at the same time. // Will allow average of "rps" requests per second over an extended period of time, with max "burst" requests at the same time.
// getTime should return the current time. For non-testing purposes use time.Now // getTime should return the current time. For non-testing purposes use time.Now
func RateLimit(rps, burst int, getTime getTimeFn) macaron.Handler { func RateLimit(rps, burst int, getTime getTimeFn) web.Handler {
l := rate.NewLimiter(rate.Limit(rps), burst) l := rate.NewLimiter(rate.Limit(rps), burst)
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
if !l.AllowN(getTime(), 1) { if !l.AllowN(getTime(), 1) {

6
pkg/middleware/rate_limit_test.go
Unescape View File

@ -9,9 +9,9 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
) )
type execFunc func() *httptest.ResponseRecorder type execFunc func() *httptest.ResponseRecorder
@ -31,8 +31,8 @@ func rateLimiterScenario(t *testing.T, desc string, rps int, burst int, fn rateL
cfg := setting.NewCfg() cfg := setting.NewCfg()
m := macaron.New() m := web.New()
m.UseMiddleware(macaron.Renderer("../../public/views", "[[", "]]")) m.UseMiddleware(web.Renderer("../../public/views", "[[", "]]"))
m.Use(getContextHandler(t, cfg).Middleware) m.Use(getContextHandler(t, cfg).Middleware)
m.Get("/foo", RateLimit(rps, burst, func() time.Time { return currentTime }), defaultHandler) m.Get("/foo", RateLimit(rps, burst, func() time.Time { return currentTime }), defaultHandler)

7
pkg/middleware/recovery.go
Unescape View File

@ -23,11 +23,10 @@ import (
"net/http" "net/http"
"runtime" "runtime"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/contexthandler"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
) )
var ( var (
@ -103,8 +102,8 @@ func function(pc uintptr) []byte {
// Recovery returns a middleware that recovers from any panics and writes a 500 if there was one. // Recovery returns a middleware that recovers from any panics and writes a 500 if there was one.
// While Martini is in development mode, Recovery will also output the panic as HTML. // While Martini is in development mode, Recovery will also output the panic as HTML.
func Recovery(cfg *setting.Cfg) macaron.Handler { func Recovery(cfg *setting.Cfg) web.Handler {
return func(c *macaron.Context) { return func(c *web.Context) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
panicLogger := log.Root panicLogger := log.Root

6
pkg/middleware/recovery_test.go
Unescape View File

@ -10,9 +10,9 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/auth" "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
macaron "gopkg.in/macaron.v1"
) )
func TestRecoveryMiddleware(t *testing.T) { func TestRecoveryMiddleware(t *testing.T) {
@ -61,11 +61,11 @@ func recoveryScenario(t *testing.T, desc string, url string, fn scenarioFunc) {
viewsPath, err := filepath.Abs("../../public/views") viewsPath, err := filepath.Abs("../../public/views")
require.NoError(t, err) require.NoError(t, err)
sc.m = macaron.New() sc.m = web.New()
sc.m.Use(Recovery(cfg)) sc.m.Use(Recovery(cfg))
sc.m.Use(AddDefaultResponseHeaders(cfg)) sc.m.Use(AddDefaultResponseHeaders(cfg))
sc.m.UseMiddleware(macaron.Renderer(viewsPath, "[[", "]]")) sc.m.UseMiddleware(web.Renderer(viewsPath, "[[", "]]"))
sc.userAuthTokenService = auth.NewFakeUserAuthTokenService() sc.userAuthTokenService = auth.NewFakeUserAuthTokenService()
sc.remoteCacheService = remotecache.NewFakeStore(t) sc.remoteCacheService = remotecache.NewFakeStore(t)

10
pkg/middleware/request_metrics.go
Unescape View File

@ -8,9 +8,9 @@ import (
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
cw "github.com/weaveworks/common/middleware" cw "github.com/weaveworks/common/middleware"
"gopkg.in/macaron.v1"
) )
var ( var (
@ -45,10 +45,10 @@ func init() {
} }
// RequestMetrics is a middleware handler that instruments the request. // RequestMetrics is a middleware handler that instruments the request.
func RequestMetrics(cfg *setting.Cfg) func(handler string) macaron.Handler { func RequestMetrics(cfg *setting.Cfg) func(handler string) web.Handler {
return func(handler string) macaron.Handler { return func(handler string) web.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { return func(res http.ResponseWriter, req *http.Request, c *web.Context) {
rw := res.(macaron.ResponseWriter) rw := res.(web.ResponseWriter)
now := time.Now() now := time.Now()
httpRequestsInFlight.Inc() httpRequestsInFlight.Inc()
defer httpRequestsInFlight.Dec() defer httpRequestsInFlight.Dec()

12
pkg/middleware/request_tracing.go
Unescape View File

@ -9,7 +9,7 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/ext"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
type contextKey struct{} type contextKey struct{}
@ -19,8 +19,8 @@ var routeOperationNameKey = contextKey{}
// ProvideRouteOperationName creates a named middleware responsible for populating // ProvideRouteOperationName creates a named middleware responsible for populating
// the context with the route operation name that can be used later in the request pipeline. // the context with the route operation name that can be used later in the request pipeline.
// Implements routing.RegisterNamedMiddleware. // Implements routing.RegisterNamedMiddleware.
func ProvideRouteOperationName(name string) macaron.Handler { func ProvideRouteOperationName(name string) web.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { return func(res http.ResponseWriter, req *http.Request, c *web.Context) {
ctx := context.WithValue(c.Req.Context(), routeOperationNameKey, name) ctx := context.WithValue(c.Req.Context(), routeOperationNameKey, name)
c.Req = c.Req.WithContext(ctx) c.Req = c.Req.WithContext(ctx)
} }
@ -36,15 +36,15 @@ func RouteOperationNameFromContext(ctx context.Context) (string, bool) {
return "", false return "", false
} }
func RequestTracing() macaron.Handler { func RequestTracing() web.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { return func(res http.ResponseWriter, req *http.Request, c *web.Context) {
if strings.HasPrefix(c.Req.URL.Path, "/public/") || if strings.HasPrefix(c.Req.URL.Path, "/public/") ||
c.Req.URL.Path == "robots.txt" { c.Req.URL.Path == "robots.txt" {
c.Next() c.Next()
return return
} }
rw := res.(macaron.ResponseWriter) rw := res.(web.ResponseWriter)
tracer := opentracing.GlobalTracer() tracer := opentracing.GlobalTracer()
wireContext, _ := tracer.Extract(opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(req.Header)) wireContext, _ := tracer.Extract(opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(req.Header))

7
pkg/middleware/testing.go
Unescape View File

@ -6,20 +6,19 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/infra/remotecache" "github.com/grafana/grafana/pkg/infra/remotecache"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/auth" "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/contexthandler" "github.com/grafana/grafana/pkg/services/contexthandler"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
type scenarioContext struct { type scenarioContext struct {
t *testing.T t *testing.T
m *macaron.Macaron m *web.Mux
context *models.ReqContext context *models.ReqContext
resp *httptest.ResponseRecorder resp *httptest.ResponseRecorder
apiKey string apiKey string
@ -28,7 +27,7 @@ type scenarioContext struct {
tokenSessionCookie string tokenSessionCookie string
respJson map[string]interface{} respJson map[string]interface{}
handlerFunc handlerFunc handlerFunc handlerFunc
defaultHandler macaron.Handler defaultHandler web.Handler
url string url string
userAuthTokenService *auth.FakeUserAuthTokenService userAuthTokenService *auth.FakeUserAuthTokenService
jwtAuthService *models.FakeJWTService jwtAuthService *models.FakeJWTService

4
pkg/middleware/validate_host.go
Unescape View File

@ -5,10 +5,10 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
func ValidateHostHeader(cfg *setting.Cfg) macaron.Handler { func ValidateHostHeader(cfg *setting.Cfg) web.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
// ignore local render calls // ignore local render calls
if c.IsRenderCall { if c.IsRenderCall {

4
pkg/models/context.go
Unescape View File

@ -5,12 +5,12 @@ import (
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"gopkg.in/macaron.v1"
) )
type ReqContext struct { type ReqContext struct {
*macaron.Context *web.Context
*SignedInUser *SignedInUser
UserToken *UserToken UserToken *UserToken

4
pkg/models/context_test.go
Unescape View File

@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
) )
func TestQueryBoolWithDefault(t *testing.T) { func TestQueryBoolWithDefault(t *testing.T) {
@ -31,7 +31,7 @@ func TestQueryBoolWithDefault(t *testing.T) {
req, err := http.NewRequest("GET", tt.url, nil) req, err := http.NewRequest("GET", tt.url, nil)
require.NoError(t, err) require.NoError(t, err)
r := ReqContext{ r := ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
} }
require.Equal(t, tt.expected, r.QueryBoolWithDefault("silenced", tt.defaultValue)) require.Equal(t, tt.expected, r.QueryBoolWithDefault("silenced", tt.defaultValue))
}) })

9
pkg/services/accesscontrol/middleware/middleware.go
Unescape View File

@ -5,15 +5,14 @@ import (
"net/http" "net/http"
"time" "time"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
) )
func Middleware(ac accesscontrol.AccessControl) func(macaron.Handler, accesscontrol.Evaluator) macaron.Handler { func Middleware(ac accesscontrol.AccessControl) func(web.Handler, accesscontrol.Evaluator) web.Handler {
return func(fallback macaron.Handler, evaluator accesscontrol.Evaluator) macaron.Handler { return func(fallback web.Handler, evaluator accesscontrol.Evaluator) web.Handler {
if ac.IsDisabled() { if ac.IsDisabled() {
return fallback return fallback
} }
@ -73,6 +72,6 @@ func newID() string {
func buildScopeParams(c *models.ReqContext) accesscontrol.ScopeParams { func buildScopeParams(c *models.ReqContext) accesscontrol.ScopeParams {
return accesscontrol.ScopeParams{ return accesscontrol.ScopeParams{
OrgID: c.OrgId, OrgID: c.OrgId,
URLParams: macaron.Params(c.Req), URLParams: web.Params(c.Req),
} }
} }

11
pkg/services/accesscontrol/middleware/middleware_test.go
Unescape View File

@ -5,8 +5,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
@ -58,8 +57,8 @@ func TestMiddleware(t *testing.T) {
fallbackCalled = true fallbackCalled = true
} }
server := macaron.New() server := web.New()
server.UseMiddleware(macaron.Renderer("../../public/views", "[[", "]]")) server.UseMiddleware(web.Renderer("../../public/views", "[[", "]]"))
server.Use(contextProvider()) server.Use(contextProvider())
server.Use(Middleware(test.ac)(fallback, test.evaluator)) server.Use(Middleware(test.ac)(fallback, test.evaluator))
@ -81,8 +80,8 @@ func TestMiddleware(t *testing.T) {
} }
} }
func contextProvider() macaron.Handler { func contextProvider() web.Handler {
return func(c *macaron.Context) { return func(c *web.Context) {
reqCtx := &models.ReqContext{ reqCtx := &models.ReqContext{
Context: c, Context: c,
Logger: log.New(""), Logger: log.New(""),

4
pkg/services/contexthandler/auth_proxy_test.go
Unescape View File

@ -15,8 +15,8 @@ import (
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
macaron "gopkg.in/macaron.v1"
) )
// Test initContextWithAuthProxy with a cached user ID that is no longer valid. // Test initContextWithAuthProxy with a cached user ID that is no longer valid.
@ -58,7 +58,7 @@ func TestInitContextWithAuthProxy_CachedInvalidUserID(t *testing.T) {
req, err := http.NewRequest("POST", "http://example.com", nil) req, err := http.NewRequest("POST", "http://example.com", nil)
require.NoError(t, err) require.NoError(t, err)
ctx := &models.ReqContext{ ctx := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
Logger: log.New("Test"), Logger: log.New("Test"),
} }
req.Header.Set(svc.Cfg.AuthProxyHeaderName, name) req.Header.Set(svc.Cfg.AuthProxyHeaderName, name)

4
pkg/services/contexthandler/authproxy/authproxy_test.go
Unescape View File

@ -13,9 +13,9 @@ import (
"github.com/grafana/grafana/pkg/services/ldap" "github.com/grafana/grafana/pkg/services/ldap"
"github.com/grafana/grafana/pkg/services/multildap" "github.com/grafana/grafana/pkg/services/multildap"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
) )
type fakeMultiLDAP struct { type fakeMultiLDAP struct {
@ -64,7 +64,7 @@ func prepareMiddleware(t *testing.T, remoteCache *remotecache.RemoteCache, cb fu
} }
ctx := &models.ReqContext{ ctx := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
} }
auth := New(cfg, &Options{ auth := New(cfg, &Options{

8
pkg/services/contexthandler/contexthandler.go
Unescape View File

@ -21,10 +21,10 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
ol "github.com/opentracing/opentracing-go/log" ol "github.com/opentracing/opentracing-go/log"
cw "github.com/weaveworks/common/middleware" cw "github.com/weaveworks/common/middleware"
"gopkg.in/macaron.v1"
) )
const ( const (
@ -71,7 +71,7 @@ func FromContext(c context.Context) *models.ReqContext {
} }
// Middleware provides a middleware to initialize the Macaron context. // Middleware provides a middleware to initialize the Macaron context.
func (h *ContextHandler) Middleware(mContext *macaron.Context) { func (h *ContextHandler) Middleware(mContext *web.Context) {
span, _ := opentracing.StartSpanFromContext(mContext.Req.Context(), "Auth - Middleware") span, _ := opentracing.StartSpanFromContext(mContext.Req.Context(), "Auth - Middleware")
defer span.Finish() defer span.Finish()
@ -320,8 +320,8 @@ func (h *ContextHandler) initContextWithToken(reqContext *models.ReqContext, org
} }
func (h *ContextHandler) rotateEndOfRequestFunc(reqContext *models.ReqContext, authTokenService models.UserTokenService, func (h *ContextHandler) rotateEndOfRequestFunc(reqContext *models.ReqContext, authTokenService models.UserTokenService,
token *models.UserToken) macaron.BeforeFunc { token *models.UserToken) web.BeforeFunc {
return func(w macaron.ResponseWriter) { return func(w web.ResponseWriter) {
// if response has already been written, skip. // if response has already been written, skip.
if w.Written() { if w.Written() {
return return

6
pkg/services/contexthandler/contexthandler_test.go
Unescape View File

@ -12,9 +12,9 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/auth" "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
macaron "gopkg.in/macaron.v1"
) )
func TestDontRotateTokensOnCancelledRequests(t *testing.T) { func TestDontRotateTokensOnCancelledRequests(t *testing.T) {
@ -96,7 +96,7 @@ func initTokenRotationScenario(ctx context.Context, t *testing.T, ctxHdlr *Conte
return nil, nil, err return nil, nil, err
} }
reqContext := &models.ReqContext{ reqContext := &models.ReqContext{
Context: &macaron.Context{Req: req}, Context: &web.Context{Req: req},
Logger: log.New("testlogger"), Logger: log.New("testlogger"),
} }
@ -114,7 +114,7 @@ func (mw mockWriter) Flush() {}
func (mw mockWriter) Status() int { return 0 } func (mw mockWriter) Status() int { return 0 }
func (mw mockWriter) Size() int { return 0 } func (mw mockWriter) Size() int { return 0 }
func (mw mockWriter) Written() bool { return false } func (mw mockWriter) Written() bool { return false }
func (mw mockWriter) Before(macaron.BeforeFunc) {} func (mw mockWriter) Before(web.BeforeFunc) {}
func (mw mockWriter) Push(target string, opts *http.PushOptions) error { func (mw mockWriter) Push(target string, opts *http.PushOptions) error {
return nil return nil
} }

13
pkg/services/libraryelements/api.go
Unescape View File

@ -4,12 +4,11 @@ import (
"errors" "errors"
"github.com/go-macaron/binding" "github.com/go-macaron/binding"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/web"
) )
func (l *LibraryElementService) registerAPIEndpoints() { func (l *LibraryElementService) registerAPIEndpoints() {
@ -36,7 +35,7 @@ func (l *LibraryElementService) createHandler(c *models.ReqContext, cmd CreateLi
// deleteHandler handles DELETE /api/library-elements/:uid. // deleteHandler handles DELETE /api/library-elements/:uid.
func (l *LibraryElementService) deleteHandler(c *models.ReqContext) response.Response { func (l *LibraryElementService) deleteHandler(c *models.ReqContext) response.Response {
err := l.deleteLibraryElement(c.Req.Context(), c.SignedInUser, macaron.Params(c.Req)[":uid"]) err := l.deleteLibraryElement(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return toLibraryElementError(err, "Failed to delete library element") return toLibraryElementError(err, "Failed to delete library element")
} }
@ -46,7 +45,7 @@ func (l *LibraryElementService) deleteHandler(c *models.ReqContext) response.Res
// getHandler handles GET /api/library-elements/:uid. // getHandler handles GET /api/library-elements/:uid.
func (l *LibraryElementService) getHandler(c *models.ReqContext) response.Response { func (l *LibraryElementService) getHandler(c *models.ReqContext) response.Response {
element, err := l.getLibraryElementByUid(c.Req.Context(), c.SignedInUser, macaron.Params(c.Req)[":uid"]) element, err := l.getLibraryElementByUid(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return toLibraryElementError(err, "Failed to get library element") return toLibraryElementError(err, "Failed to get library element")
} }
@ -76,7 +75,7 @@ func (l *LibraryElementService) getAllHandler(c *models.ReqContext) response.Res
// patchHandler handles PATCH /api/library-elements/:uid // patchHandler handles PATCH /api/library-elements/:uid
func (l *LibraryElementService) patchHandler(c *models.ReqContext, cmd patchLibraryElementCommand) response.Response { func (l *LibraryElementService) patchHandler(c *models.ReqContext, cmd patchLibraryElementCommand) response.Response {
element, err := l.patchLibraryElement(c.Req.Context(), c.SignedInUser, cmd, macaron.Params(c.Req)[":uid"]) element, err := l.patchLibraryElement(c.Req.Context(), c.SignedInUser, cmd, web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return toLibraryElementError(err, "Failed to update library element") return toLibraryElementError(err, "Failed to update library element")
} }
@ -86,7 +85,7 @@ func (l *LibraryElementService) patchHandler(c *models.ReqContext, cmd patchLibr
// getConnectionsHandler handles GET /api/library-panels/:uid/connections/. // getConnectionsHandler handles GET /api/library-panels/:uid/connections/.
func (l *LibraryElementService) getConnectionsHandler(c *models.ReqContext) response.Response { func (l *LibraryElementService) getConnectionsHandler(c *models.ReqContext) response.Response {
connections, err := l.getConnections(c.Req.Context(), c.SignedInUser, macaron.Params(c.Req)[":uid"]) connections, err := l.getConnections(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":uid"])
if err != nil { if err != nil {
return toLibraryElementError(err, "Failed to get connections") return toLibraryElementError(err, "Failed to get connections")
} }
@ -96,7 +95,7 @@ func (l *LibraryElementService) getConnectionsHandler(c *models.ReqContext) resp
// getByNameHandler handles GET /api/library-elements/name/:name/. // getByNameHandler handles GET /api/library-elements/name/:name/.
func (l *LibraryElementService) getByNameHandler(c *models.ReqContext) response.Response { func (l *LibraryElementService) getByNameHandler(c *models.ReqContext) response.Response {
elements, err := l.getLibraryElementsByName(c.Req.Context(), c.SignedInUser, macaron.Params(c.Req)[":name"]) elements, err := l.getLibraryElementsByName(c.Req.Context(), c.SignedInUser, web.Params(c.Req)[":name"])
if err != nil { if err != nil {
return toLibraryElementError(err, "Failed to get library element") return toLibraryElementError(err, "Failed to get library element")
} }

9
pkg/services/libraryelements/libraryelements_delete_test.go
Unescape View File

@ -4,8 +4,7 @@ import (
"testing" "testing"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
@ -20,14 +19,14 @@ func TestDeleteLibraryElement(t *testing.T) {
scenarioWithPanel(t, "When an admin tries to delete a library panel that exists, it should succeed", scenarioWithPanel(t, "When an admin tries to delete a library panel that exists, it should succeed",
func(t *testing.T, sc scenarioContext) { func(t *testing.T, sc scenarioContext) {
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.deleteHandler(sc.reqContext) resp := sc.service.deleteHandler(sc.reqContext)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
}) })
scenarioWithPanel(t, "When an admin tries to delete a library panel in another org, it should fail", scenarioWithPanel(t, "When an admin tries to delete a library panel in another org, it should fail",
func(t *testing.T, sc scenarioContext) { func(t *testing.T, sc scenarioContext) {
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
sc.reqContext.SignedInUser.OrgId = 2 sc.reqContext.SignedInUser.OrgId = 2
sc.reqContext.SignedInUser.OrgRole = models.ROLE_ADMIN sc.reqContext.SignedInUser.OrgRole = models.ROLE_ADMIN
resp := sc.service.deleteHandler(sc.reqContext) resp := sc.service.deleteHandler(sc.reqContext)
@ -70,7 +69,7 @@ func TestDeleteLibraryElement(t *testing.T) {
err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.Id) err := sc.service.ConnectElementsToDashboard(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, []string{sc.initialResult.Result.UID}, dashInDB.Id)
require.NoError(t, err) require.NoError(t, err)
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.deleteHandler(sc.reqContext) resp := sc.service.deleteHandler(sc.reqContext)
require.Equal(t, 403, resp.Status()) require.Equal(t, 403, resp.Status())
}) })

21
pkg/services/libraryelements/libraryelements_get_test.go
Unescape View File

@ -3,10 +3,9 @@ package libraryelements
import ( import (
"testing" "testing"
"github.com/grafana/grafana/pkg/components/simplejson"
"gopkg.in/macaron.v1"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
@ -16,12 +15,12 @@ func TestGetLibraryElement(t *testing.T) {
scenarioWithPanel(t, "When an admin tries to get a library panel that does not exist, it should fail", scenarioWithPanel(t, "When an admin tries to get a library panel that does not exist, it should fail",
func(t *testing.T, sc scenarioContext) { func(t *testing.T, sc scenarioContext) {
// by uid // by uid
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": "unknown"}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": "unknown"})
resp := sc.service.getHandler(sc.reqContext) resp := sc.service.getHandler(sc.reqContext)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
// by name // by name
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":name": "unknown"}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":name": "unknown"})
resp = sc.service.getByNameHandler(sc.reqContext) resp = sc.service.getByNameHandler(sc.reqContext)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
}) })
@ -69,7 +68,7 @@ func TestGetLibraryElement(t *testing.T) {
} }
// by uid // by uid
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.getHandler(sc.reqContext) resp := sc.service.getHandler(sc.reqContext)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
@ -78,7 +77,7 @@ func TestGetLibraryElement(t *testing.T) {
} }
// by name // by name
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name})
resp = sc.service.getByNameHandler(sc.reqContext) resp = sc.service.getByNameHandler(sc.reqContext)
arrayResult := validateAndUnMarshalArrayResponse(t, resp) arrayResult := validateAndUnMarshalArrayResponse(t, resp)
@ -164,7 +163,7 @@ func TestGetLibraryElement(t *testing.T) {
} }
// by uid // by uid
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.getHandler(sc.reqContext) resp := sc.service.getHandler(sc.reqContext)
result := validateAndUnMarshalResponse(t, resp) result := validateAndUnMarshalResponse(t, resp)
@ -173,7 +172,7 @@ func TestGetLibraryElement(t *testing.T) {
} }
// by name // by name
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name})
resp = sc.service.getByNameHandler(sc.reqContext) resp = sc.service.getByNameHandler(sc.reqContext)
arrayResult := validateAndUnMarshalArrayResponse(t, resp) arrayResult := validateAndUnMarshalArrayResponse(t, resp)
if diff := cmp.Diff(libraryElementArrayResult{Result: []libraryElement{expected(result).Result}}, arrayResult, getCompareOptions()...); diff != "" { if diff := cmp.Diff(libraryElementArrayResult{Result: []libraryElement{expected(result).Result}}, arrayResult, getCompareOptions()...); diff != "" {
@ -187,12 +186,12 @@ func TestGetLibraryElement(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = models.ROLE_ADMIN sc.reqContext.SignedInUser.OrgRole = models.ROLE_ADMIN
// by uid // by uid
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.getHandler(sc.reqContext) resp := sc.service.getHandler(sc.reqContext)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
// by name // by name
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":name": sc.initialResult.Result.Name})
resp = sc.service.getByNameHandler(sc.reqContext) resp = sc.service.getByNameHandler(sc.reqContext)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
}) })

39
pkg/services/libraryelements/libraryelements_patch_test.go
Unescape View File

@ -6,17 +6,16 @@ import (
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require"
) )
func TestPatchLibraryElement(t *testing.T) { func TestPatchLibraryElement(t *testing.T) {
scenarioWithPanel(t, "When an admin tries to patch a library panel that does not exist, it should fail", scenarioWithPanel(t, "When an admin tries to patch a library panel that does not exist, it should fail",
func(t *testing.T, sc scenarioContext) { func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": "unknown"}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": "unknown"})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
}) })
@ -39,7 +38,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
@ -91,7 +90,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
@ -112,7 +111,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.Name = "New Name" sc.initialResult.Result.Name = "New Name"
@ -133,7 +132,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.UID = cmd.UID sc.initialResult.Result.UID = cmd.UID
@ -154,7 +153,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 400, resp.Status()) require.Equal(t, 400, resp.Status())
}) })
@ -167,7 +166,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 400, resp.Status()) require.Equal(t, 400, resp.Status())
}) })
@ -184,7 +183,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 400, resp.Status()) require.Equal(t, 400, resp.Status())
}) })
@ -197,7 +196,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.Type = "graph" sc.initialResult.Result.Type = "graph"
@ -224,7 +223,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.Type = "text" sc.initialResult.Result.Type = "text"
@ -249,7 +248,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
Version: 1, Version: 1,
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.Type = "graph" sc.initialResult.Result.Type = "graph"
@ -270,7 +269,7 @@ func TestPatchLibraryElement(t *testing.T) {
func(t *testing.T, sc scenarioContext) { func(t *testing.T, sc scenarioContext) {
cmd := patchLibraryElementCommand{FolderID: -1, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: -1, Version: 1, Kind: int64(models.PanelElement)}
sc.reqContext.UserId = 2 sc.reqContext.UserId = 2
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)
sc.initialResult.Result.Meta.UpdatedBy.ID = int64(2) sc.initialResult.Result.Meta.UpdatedBy.ID = int64(2)
@ -292,7 +291,7 @@ func TestPatchLibraryElement(t *testing.T) {
Version: 1, Version: 1,
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 400, resp.Status()) require.Equal(t, 400, resp.Status())
}) })
@ -308,7 +307,7 @@ func TestPatchLibraryElement(t *testing.T) {
Version: 1, Version: 1,
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 400, resp.Status()) require.Equal(t, 400, resp.Status())
}) })
@ -321,7 +320,7 @@ func TestPatchLibraryElement(t *testing.T) {
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
} }
sc.reqContext.OrgId = 2 sc.reqContext.OrgId = 2
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
}) })
@ -333,7 +332,7 @@ func TestPatchLibraryElement(t *testing.T) {
Version: 1, Version: 1,
Kind: int64(models.PanelElement), Kind: int64(models.PanelElement),
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
@ -347,7 +346,7 @@ func TestPatchLibraryElement(t *testing.T) {
Version: 1, Version: 1,
Kind: int64(models.VariableElement), Kind: int64(models.VariableElement),
} }
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": sc.initialResult.Result.UID})
resp := sc.service.patchHandler(sc.reqContext, cmd) resp := sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
var result = validateAndUnMarshalResponse(t, resp) var result = validateAndUnMarshalResponse(t, resp)

23
pkg/services/libraryelements/libraryelements_permissions_test.go
Unescape View File

@ -6,10 +6,9 @@ import (
"testing" "testing"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require"
) )
func TestLibraryElementPermissions(t *testing.T) { func TestLibraryElementPermissions(t *testing.T) {
@ -86,7 +85,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
cmd := patchLibraryElementCommand{FolderID: toFolder.Id, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: toFolder.Id, Version: 1, Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -101,7 +100,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
cmd := patchLibraryElementCommand{FolderID: toFolder.Id, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: toFolder.Id, Version: 1, Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -114,7 +113,7 @@ func TestLibraryElementPermissions(t *testing.T) {
result := validateAndUnMarshalResponse(t, resp) result := validateAndUnMarshalResponse(t, resp)
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.deleteHandler(sc.reqContext) resp = sc.service.deleteHandler(sc.reqContext)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -148,7 +147,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
cmd := patchLibraryElementCommand{FolderID: 0, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: 0, Version: 1, Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -162,7 +161,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
cmd := patchLibraryElementCommand{FolderID: folder.Id, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: folder.Id, Version: 1, Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -174,7 +173,7 @@ func TestLibraryElementPermissions(t *testing.T) {
result := validateAndUnMarshalResponse(t, resp) result := validateAndUnMarshalResponse(t, resp)
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.deleteHandler(sc.reqContext) resp = sc.service.deleteHandler(sc.reqContext)
require.Equal(t, testCase.status, resp.Status()) require.Equal(t, testCase.status, resp.Status())
}) })
@ -207,7 +206,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
cmd := patchLibraryElementCommand{FolderID: -100, Version: 1, Kind: int64(models.PanelElement)} cmd := patchLibraryElementCommand{FolderID: -100, Version: 1, Kind: int64(models.PanelElement)}
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.patchHandler(sc.reqContext, cmd) resp = sc.service.patchHandler(sc.reqContext, cmd)
require.Equal(t, 404, resp.Status()) require.Equal(t, 404, resp.Status())
}) })
@ -242,7 +241,7 @@ func TestLibraryElementPermissions(t *testing.T) {
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
for i, result := range results { for i, result := range results {
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.UID})
resp := sc.service.getHandler(sc.reqContext) resp := sc.service.getHandler(sc.reqContext)
require.Equal(t, testCase.statuses[i], resp.Status()) require.Equal(t, testCase.statuses[i], resp.Status())
} }
@ -261,7 +260,7 @@ func TestLibraryElementPermissions(t *testing.T) {
result.Result.Meta.FolderUID = "" result.Result.Meta.FolderUID = ""
sc.reqContext.SignedInUser.OrgRole = testCase.role sc.reqContext.SignedInUser.OrgRole = testCase.role
sc.ctx.Req = macaron.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID}) sc.ctx.Req = web.SetURLParams(sc.ctx.Req, map[string]string{":uid": result.Result.UID})
resp = sc.service.getHandler(sc.reqContext) resp = sc.service.getHandler(sc.reqContext)
require.Equal(t, 200, resp.Status()) require.Equal(t, 200, resp.Status())
var actual libraryElementResult var actual libraryElementResult

9
pkg/services/libraryelements/libraryelements_test.go
Unescape View File

@ -12,14 +12,13 @@ import (
dboards "github.com/grafana/grafana/pkg/dashboards" dboards "github.com/grafana/grafana/pkg/dashboards"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboards" "github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/stretchr/testify/require"
) )
const userInDbName = "user_in_db" const userInDbName = "user_in_db"
@ -163,7 +162,7 @@ func getCreateCommandWithModel(folderID int64, name string, kind models.LibraryE
} }
type scenarioContext struct { type scenarioContext struct {
ctx *macaron.Context ctx *web.Context
service *LibraryElementService service *LibraryElementService
reqContext *models.ReqContext reqContext *models.ReqContext
user models.SignedInUser user models.SignedInUser
@ -280,7 +279,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
t.Helper() t.Helper()
t.Run(desc, func(t *testing.T) { t.Run(desc, func(t *testing.T) {
ctx := macaron.Context{Req: &http.Request{}} ctx := web.Context{Req: &http.Request{}}
orgID := int64(1) orgID := int64(1)
role := models.ROLE_ADMIN role := models.ROLE_ADMIN
sqlStore := sqlstore.InitTestDB(t) sqlStore := sqlstore.InitTestDB(t)

6
pkg/services/live/live.go
Unescape View File

@ -43,8 +43,8 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/cloudwatch"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"gopkg.in/macaron.v1"
) )
var ( var (
@ -333,7 +333,7 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r
g.pushWebsocketHandler = func(ctx *models.ReqContext) { g.pushWebsocketHandler = func(ctx *models.ReqContext) {
user := ctx.SignedInUser user := ctx.SignedInUser
newCtx := livecontext.SetContextSignedUser(ctx.Req.Context(), user) newCtx := livecontext.SetContextSignedUser(ctx.Req.Context(), user)
newCtx = livecontext.SetContextStreamID(newCtx, macaron.Params(ctx.Req)[":streamId"]) newCtx = livecontext.SetContextStreamID(newCtx, web.Params(ctx.Req)[":streamId"])
r := ctx.Req.WithContext(newCtx) r := ctx.Req.WithContext(newCtx)
pushWSHandler.ServeHTTP(ctx.Resp, r) pushWSHandler.ServeHTTP(ctx.Resp, r)
} }
@ -968,7 +968,7 @@ func (g *GrafanaLive) HandleListHTTP(c *models.ReqContext) response.Response {
// HandleInfoHTTP special http response for // HandleInfoHTTP special http response for
func (g *GrafanaLive) HandleInfoHTTP(ctx *models.ReqContext) response.Response { func (g *GrafanaLive) HandleInfoHTTP(ctx *models.ReqContext) response.Response {
path := macaron.Params(ctx.Req)["*"] path := web.Params(ctx.Req)["*"]
if path == "grafana/dashboards/gitops" { if path == "grafana/dashboards/gitops" {
return response.JSON(200, util.DynMap{ return response.JSON(200, util.DynMap{
"active": g.GrafanaScope.Dashboards.HasGitOpsObserver(ctx.SignedInUser.OrgId), "active": g.GrafanaScope.Dashboards.HasGitOpsObserver(ctx.SignedInUser.OrgId),

8
pkg/services/live/pushhttp/push.go
Unescape View File

@ -14,7 +14,7 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
liveDto "github.com/grafana/grafana-plugin-sdk-go/live" liveDto "github.com/grafana/grafana-plugin-sdk-go/live"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
var ( var (
@ -46,7 +46,7 @@ func (g *Gateway) Run(ctx context.Context) error {
} }
func (g *Gateway) Handle(ctx *models.ReqContext) { func (g *Gateway) Handle(ctx *models.ReqContext) {
streamID := macaron.Params(ctx.Req)[":streamId"] streamID := web.Params(ctx.Req)[":streamId"]
stream, err := g.GrafanaLive.ManagedStreamRunner.GetOrCreateStream(ctx.SignedInUser.OrgId, liveDto.ScopeStream, streamID) stream, err := g.GrafanaLive.ManagedStreamRunner.GetOrCreateStream(ctx.SignedInUser.OrgId, liveDto.ScopeStream, streamID)
if err != nil { if err != nil {
@ -97,8 +97,8 @@ func (g *Gateway) Handle(ctx *models.ReqContext) {
} }
func (g *Gateway) HandlePath(ctx *models.ReqContext) { func (g *Gateway) HandlePath(ctx *models.ReqContext) {
streamID := macaron.Params(ctx.Req)[":streamId"] streamID := web.Params(ctx.Req)[":streamId"]
path := macaron.Params(ctx.Req)[":path"] path := web.Params(ctx.Req)[":path"]
body, err := io.ReadAll(ctx.Req.Body) body, err := io.ReadAll(ctx.Req.Body)
if err != nil { if err != nil {

6
pkg/services/ngalert/api/api_alertmanager.go
Unescape View File

@ -20,7 +20,7 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/store" "github.com/grafana/grafana/pkg/services/ngalert/store"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
const ( const (
@ -178,7 +178,7 @@ func (srv AlertmanagerSrv) RouteDeleteSilence(c *models.ReqContext) response.Res
return errResp return errResp
} }
silenceID := macaron.Params(c.Req)[":SilenceId"] silenceID := web.Params(c.Req)[":SilenceId"]
if err := am.DeleteSilence(silenceID); err != nil { if err := am.DeleteSilence(silenceID); err != nil {
if errors.Is(err, notifier.ErrSilenceNotFound) { if errors.Is(err, notifier.ErrSilenceNotFound) {
return ErrResp(http.StatusNotFound, err, "") return ErrResp(http.StatusNotFound, err, "")
@ -305,7 +305,7 @@ func (srv AlertmanagerSrv) RouteGetSilence(c *models.ReqContext) response.Respon
return errResp return errResp
} }
silenceID := macaron.Params(c.Req)[":SilenceId"] silenceID := web.Params(c.Req)[":SilenceId"]
gettableSilence, err := am.GetSilence(silenceID) gettableSilence, err := am.GetSilence(silenceID)
if err != nil { if err != nil {
if errors.Is(err, notifier.ErrSilenceNotFound) { if errors.Is(err, notifier.ErrSilenceNotFound) {

25
pkg/services/ngalert/api/api_ruler.go
Unescape View File

@ -6,19 +6,18 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/ngalert/state"
"github.com/grafana/grafana/pkg/services/ngalert/store"
"github.com/grafana/grafana/pkg/services/quota"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/apierrors" "github.com/grafana/grafana/pkg/api/apierrors"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/datasources"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models" ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/ngalert/state"
"github.com/grafana/grafana/pkg/services/ngalert/store"
"github.com/grafana/grafana/pkg/services/quota"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
) )
@ -31,7 +30,7 @@ type RulerSrv struct {
} }
func (srv RulerSrv) RouteDeleteNamespaceRulesConfig(c *models.ReqContext) response.Response { func (srv RulerSrv) RouteDeleteNamespaceRulesConfig(c *models.ReqContext) response.Response {
namespaceTitle := macaron.Params(c.Req)[":Namespace"] namespaceTitle := web.Params(c.Req)[":Namespace"]
namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true) namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true)
if err != nil { if err != nil {
return toNamespaceErrorResponse(err) return toNamespaceErrorResponse(err)
@ -50,12 +49,12 @@ func (srv RulerSrv) RouteDeleteNamespaceRulesConfig(c *models.ReqContext) respon
} }
func (srv RulerSrv) RouteDeleteRuleGroupConfig(c *models.ReqContext) response.Response { func (srv RulerSrv) RouteDeleteRuleGroupConfig(c *models.ReqContext) response.Response {
namespaceTitle := macaron.Params(c.Req)[":Namespace"] namespaceTitle := web.Params(c.Req)[":Namespace"]
namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true) namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true)
if err != nil { if err != nil {
return toNamespaceErrorResponse(err) return toNamespaceErrorResponse(err)
} }
ruleGroup := macaron.Params(c.Req)[":Groupname"] ruleGroup := web.Params(c.Req)[":Groupname"]
uids, err := srv.store.DeleteRuleGroupAlertRules(c.SignedInUser.OrgId, namespace.Uid, ruleGroup) uids, err := srv.store.DeleteRuleGroupAlertRules(c.SignedInUser.OrgId, namespace.Uid, ruleGroup)
if err != nil { if err != nil {
@ -73,7 +72,7 @@ func (srv RulerSrv) RouteDeleteRuleGroupConfig(c *models.ReqContext) response.Re
} }
func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *models.ReqContext) response.Response { func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *models.ReqContext) response.Response {
namespaceTitle := macaron.Params(c.Req)[":Namespace"] namespaceTitle := web.Params(c.Req)[":Namespace"]
namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, false) namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, false)
if err != nil { if err != nil {
return toNamespaceErrorResponse(err) return toNamespaceErrorResponse(err)
@ -114,13 +113,13 @@ func (srv RulerSrv) RouteGetNamespaceRulesConfig(c *models.ReqContext) response.
} }
func (srv RulerSrv) RouteGetRulegGroupConfig(c *models.ReqContext) response.Response { func (srv RulerSrv) RouteGetRulegGroupConfig(c *models.ReqContext) response.Response {
namespaceTitle := macaron.Params(c.Req)[":Namespace"] namespaceTitle := web.Params(c.Req)[":Namespace"]
namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, false) namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, false)
if err != nil { if err != nil {
return toNamespaceErrorResponse(err) return toNamespaceErrorResponse(err)
} }
ruleGroup := macaron.Params(c.Req)[":Groupname"] ruleGroup := web.Params(c.Req)[":Groupname"]
q := ngmodels.ListRuleGroupAlertRulesQuery{ q := ngmodels.ListRuleGroupAlertRulesQuery{
OrgID: c.SignedInUser.OrgId, OrgID: c.SignedInUser.OrgId,
NamespaceUID: namespace.Uid, NamespaceUID: namespace.Uid,
@ -225,7 +224,7 @@ func (srv RulerSrv) RouteGetRulesConfig(c *models.ReqContext) response.Response
} }
func (srv RulerSrv) RoutePostNameRulesConfig(c *models.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig) response.Response { func (srv RulerSrv) RoutePostNameRulesConfig(c *models.ReqContext, ruleGroupConfig apimodels.PostableRuleGroupConfig) response.Response {
namespaceTitle := macaron.Params(c.Req)[":Namespace"] namespaceTitle := web.Params(c.Req)[":Namespace"]
namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true) namespace, err := srv.store.GetNamespaceByTitle(c.Req.Context(), namespaceTitle, c.SignedInUser.OrgId, c.SignedInUser, true)
if err != nil { if err != nil {
return toNamespaceErrorResponse(err) return toNamespaceErrorResponse(err)

4
pkg/services/ngalert/api/api_testing.go
Unescape View File

@ -15,7 +15,7 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/eval" "github.com/grafana/grafana/pkg/services/ngalert/eval"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
) )
type TestingApiSrv struct { type TestingApiSrv struct {
@ -27,7 +27,7 @@ type TestingApiSrv struct {
} }
func (srv TestingApiSrv) RouteTestRuleConfig(c *models.ReqContext, body apimodels.TestRulePayload) response.Response { func (srv TestingApiSrv) RouteTestRuleConfig(c *models.ReqContext, body apimodels.TestRulePayload) response.Response {
recipient := macaron.Params(c.Req)[":Recipient"] recipient := web.Params(c.Req)[":Recipient"]
if recipient == apimodels.GrafanaBackend.String() { if recipient == apimodels.GrafanaBackend.String() {
if body.Type() != apimodels.GrafanaBackend || body.GrafanaManagedCondition == nil { if body.Type() != apimodels.GrafanaBackend || body.GrafanaManagedCondition == nil {
return ErrResp(http.StatusBadRequest, errors.New("unexpected payload"), "") return ErrResp(http.StatusBadRequest, errors.New("unexpected payload"), "")

6
pkg/services/ngalert/api/lotex_am.go
Unescape View File

@ -12,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@ -140,7 +140,7 @@ func (am *LotexAM) RouteDeleteSilence(ctx *models.ReqContext) response.Response
ctx, ctx,
http.MethodDelete, http.MethodDelete,
"silence", "silence",
[]string{macaron.Params(ctx.Req)[":SilenceId"]}, []string{web.Params(ctx.Req)[":SilenceId"]},
nil, nil,
messageExtractor, messageExtractor,
nil, nil,
@ -188,7 +188,7 @@ func (am *LotexAM) RouteGetSilence(ctx *models.ReqContext) response.Response {
ctx, ctx,
http.MethodGet, http.MethodGet,
"silence", "silence",
[]string{macaron.Params(ctx.Req)[":SilenceId"]}, []string{web.Params(ctx.Req)[":SilenceId"]},
nil, nil,
jsonExtractor(&apimodels.GettableSilence{}), jsonExtractor(&apimodels.GettableSilence{}),
nil, nil,

16
pkg/services/ngalert/api/lotex_ruler.go
Unescape View File

@ -7,7 +7,7 @@ import (
"net/url" "net/url"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
"gopkg.in/macaron.v1" "github.com/grafana/grafana/pkg/web"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
@ -42,7 +42,7 @@ func (r *LotexRuler) RouteDeleteNamespaceRulesConfig(ctx *models.ReqContext) res
http.MethodDelete, http.MethodDelete,
withPath( withPath(
*ctx.Req.URL, *ctx.Req.URL,
fmt.Sprintf("%s/%s", legacyRulerPrefix, macaron.Params(ctx.Req)[":Namespace"]), fmt.Sprintf("%s/%s", legacyRulerPrefix, web.Params(ctx.Req)[":Namespace"]),
), ),
nil, nil,
messageExtractor, messageExtractor,
@ -63,8 +63,8 @@ func (r *LotexRuler) RouteDeleteRuleGroupConfig(ctx *models.ReqContext) response
fmt.Sprintf( fmt.Sprintf(
"%s/%s/%s", "%s/%s/%s",
legacyRulerPrefix, legacyRulerPrefix,
macaron.Params(ctx.Req)[":Namespace"], web.Params(ctx.Req)[":Namespace"],
macaron.Params(ctx.Req)[":Groupname"], web.Params(ctx.Req)[":Groupname"],
), ),
), ),
nil, nil,
@ -86,7 +86,7 @@ func (r *LotexRuler) RouteGetNamespaceRulesConfig(ctx *models.ReqContext) respon
fmt.Sprintf( fmt.Sprintf(
"%s/%s", "%s/%s",
legacyRulerPrefix, legacyRulerPrefix,
macaron.Params(ctx.Req)[":Namespace"], web.Params(ctx.Req)[":Namespace"],
), ),
), ),
nil, nil,
@ -108,8 +108,8 @@ func (r *LotexRuler) RouteGetRulegGroupConfig(ctx *models.ReqContext) response.R
fmt.Sprintf( fmt.Sprintf(
"%s/%s/%s", "%s/%s/%s",
legacyRulerPrefix, legacyRulerPrefix,
macaron.Params(ctx.Req)[":Namespace"], web.Params(ctx.Req)[":Namespace"],
macaron.Params(ctx.Req)[":Groupname"], web.Params(ctx.Req)[":Groupname"],
), ),
), ),
nil, nil,
@ -145,7 +145,7 @@ func (r *LotexRuler) RoutePostNameRulesConfig(ctx *models.ReqContext, conf apimo
if err != nil { if err != nil {
return ErrResp(500, err, "Failed marshal rule group") return ErrResp(500, err, "Failed marshal rule group")
} }
ns := macaron.Params(ctx.Req)[":Namespace"] ns := web.Params(ctx.Req)[":Namespace"]
u := withPath(*ctx.Req.URL, fmt.Sprintf("%s/%s", legacyRulerPrefix, ns)) u := withPath(*ctx.Req.URL, fmt.Sprintf("%s/%s", legacyRulerPrefix, ns))
return r.withReq(ctx, http.MethodPost, u, bytes.NewBuffer(yml), jsonExtractor(nil), nil) return r.withReq(ctx, http.MethodPost, u, bytes.NewBuffer(yml), jsonExtractor(nil), nil)
} }

6
pkg/services/ngalert/api/util.go
Unescape View File

@ -23,8 +23,8 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/pkg/errors" "github.com/pkg/errors"
"gopkg.in/macaron.v1"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@ -40,7 +40,7 @@ func toMacaronPath(path string) string {
} }
func backendType(ctx *models.ReqContext, cache datasources.CacheService) (apimodels.Backend, error) { func backendType(ctx *models.ReqContext, cache datasources.CacheService) (apimodels.Backend, error) {
recipient := macaron.Params(ctx.Req)[":Recipient"] recipient := web.Params(ctx.Req)[":Recipient"]
if recipient == apimodels.GrafanaBackend.String() { if recipient == apimodels.GrafanaBackend.String() {
return apimodels.GrafanaBackend, nil return apimodels.GrafanaBackend, nil
} }
@ -77,7 +77,7 @@ func replacedResponseWriter(ctx *models.ReqContext) (*models.ReqContext, *respon
resp := response.CreateNormalResponse(make(http.Header), nil, 0) resp := response.CreateNormalResponse(make(http.Header), nil, 0)
cpy := *ctx cpy := *ctx
cpyMCtx := *cpy.Context cpyMCtx := *cpy.Context
cpyMCtx.Resp = macaron.NewResponseWriter(ctx.Req.Method, &safeMacaronWrapper{resp}) cpyMCtx.Resp = web.NewResponseWriter(ctx.Req.Method, &safeMacaronWrapper{resp})
cpy.Context = &cpyMCtx cpy.Context = &cpyMCtx
return &cpy, resp return &cpy, resp
} }

6
pkg/services/ngalert/metrics/ngalert.go
Unescape View File

@ -12,10 +12,10 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
"github.com/grafana/grafana/pkg/web"
"github.com/prometheus/alertmanager/api/metrics" "github.com/prometheus/alertmanager/api/metrics"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promauto"
"gopkg.in/macaron.v1"
) )
const ( const (
@ -250,7 +250,7 @@ func Instrument(
path string, path string,
action interface{}, action interface{},
metrics *API, metrics *API,
) macaron.Handler { ) web.Handler {
normalizedPath := MakeLabelValue(path) normalizedPath := MakeLabelValue(path)
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
@ -265,7 +265,7 @@ func Instrument(
// TODO: We could look up the datasource type via our datasource service // TODO: We could look up the datasource type via our datasource service
var backend string var backend string
recipient := macaron.Params(c.Req)[":Recipient"] recipient := web.Params(c.Req)[":Recipient"]
if recipient == apimodels.GrafanaBackend.String() || recipient == "" { if recipient == apimodels.GrafanaBackend.String() || recipient == "" {
backend = GrafanaBackend backend = GrafanaBackend
} else { } else {

17
pkg/web/web.go
Unescape View File

@ -0,0 +1,17 @@
package web
import "gopkg.in/macaron.v1"
type Context = macaron.Context
type Handler = macaron.Handler
type BeforeFunc = macaron.BeforeFunc
type ResponseWriter = macaron.ResponseWriter
type Mux = macaron.Macaron
var Params = macaron.Params
var SetURLParams = macaron.SetURLParams
var NewResponseWriter = macaron.NewResponseWriter
var New = macaron.New
var Env = macaron.Env
var Renderer = macaron.Renderer
var Bind = macaron.Bind
Write Preview
Loading…
Cancel
Save