From 10e86eda690db3934a21ad95fe9df9b05c32d3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Sun, 1 Jul 2018 23:35:50 -0700
Subject: [PATCH] fix: #12461 introduced issues with route registration
 ordering, adding plugin static routes before plugins package had been
 initiated (#12474)

---
 pkg/api/api.go         | 12 ------------
 pkg/api/app_routes.go  |  2 +-
 pkg/api/http_server.go | 25 ++++++++++++++++++++++---
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 78c7aaf3f39..829b7735343 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -9,16 +9,7 @@ import (
 	m "github.com/grafana/grafana/pkg/models"
 )
 
-func (hs *HTTPServer) applyRoutes() {
-	hs.RouteRegister.Register(hs.macaron)
-
-	InitAppPluginRoutes(hs.macaron)
-
-	hs.macaron.NotFound(NotFoundHandler)
-}
-
 func (hs *HTTPServer) registerRoutes() {
-	macaronR := hs.macaron
 	reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true})
 	reqGrafanaAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true})
 	reqEditorRole := middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN)
@@ -28,9 +19,6 @@ func (hs *HTTPServer) registerRoutes() {
 	quota := middleware.Quota
 	bind := binding.Bind
 
-	// automatically set HEAD for every GET
-	macaronR.SetAutoHead(true)
-
 	r := hs.RouteRegister
 
 	// not logged in views
diff --git a/pkg/api/app_routes.go b/pkg/api/app_routes.go
index 0b7dcd32ce3..a2137089fc6 100644
--- a/pkg/api/app_routes.go
+++ b/pkg/api/app_routes.go
@@ -18,7 +18,7 @@ import (
 
 var pluginProxyTransport *http.Transport
 
-func InitAppPluginRoutes(r *macaron.Macaron) {
+func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) {
 	pluginProxyTransport = &http.Transport{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: setting.PluginAppsSkipVerifyTLS,
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 627192bb69b..0de63ce5e08 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -69,6 +69,7 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
 	var err error
 
 	hs.context = ctx
+
 	hs.applyRoutes()
 	hs.streamManager.Run(ctx)
 
@@ -169,6 +170,26 @@ func (hs *HTTPServer) newMacaron() *macaron.Macaron {
 	macaron.Env = setting.Env
 	m := macaron.New()
 
+	// automatically set HEAD for every GET
+	m.SetAutoHead(true)
+
+	return m
+}
+
+func (hs *HTTPServer) applyRoutes() {
+	// start with middlewares & static routes
+	hs.addMiddlewaresAndStaticRoutes()
+	// then add view routes & api routes
+	hs.RouteRegister.Register(hs.macaron)
+	// then custom app proxy routes
+	hs.initAppPluginRoutes(hs.macaron)
+	// lastly not found route
+	hs.macaron.NotFound(NotFoundHandler)
+}
+
+func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
+	m := hs.macaron
+
 	m.Use(middleware.Logger())
 
 	if setting.EnableGzip {
@@ -180,7 +201,7 @@ func (hs *HTTPServer) newMacaron() *macaron.Macaron {
 	for _, route := range plugins.StaticRoutes {
 		pluginRoute := path.Join("/public/plugins/", route.PluginId)
 		hs.log.Debug("Plugins: Adding route", "route", pluginRoute, "dir", route.Directory)
-		hs.mapStatic(m, route.Directory, "", pluginRoute)
+		hs.mapStatic(hs.macaron, route.Directory, "", pluginRoute)
 	}
 
 	hs.mapStatic(m, setting.StaticRootPath, "build", "public/build")
@@ -209,8 +230,6 @@ func (hs *HTTPServer) newMacaron() *macaron.Macaron {
 	}
 
 	m.Use(middleware.AddDefaultResponseHeaders())
-
-	return m
 }
 
 func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) {