1 files changed, 52 insertions, 30 deletions
diff --git a/routers/private/internal.go b/routers/private/internal.go
index 4fb267a49a..e541591a38 100644
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@@ -6,47 +6,69 @@
 package private
 
 import (
+	"net/http"
+	"reflect"
 	"strings"
 
+	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/private"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/web"
 
-	"gitea.com/macaron/binding"
-	"gitea.com/macaron/macaron"
+	"gitea.com/go-chi/binding"
 )
 
 // CheckInternalToken check internal token is set
-func CheckInternalToken(ctx *macaron.Context) {
-	tokens := ctx.Req.Header.Get("Authorization")
-	fields := strings.Fields(tokens)
-	if len(fields) != 2 || fields[0] != "Bearer" || fields[1] != setting.InternalToken {
-		log.Debug("Forbidden attempt to access internal url: Authorization header: %s", tokens)
-		ctx.Error(403)
+func CheckInternalToken(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		tokens := req.Header.Get("Authorization")
+		fields := strings.Fields(tokens)
+		if len(fields) != 2 || fields[0] != "Bearer" || fields[1] != setting.InternalToken {
+			log.Debug("Forbidden attempt to access internal url: Authorization header: %s", tokens)
+			http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
+		} else {
+			next.ServeHTTP(w, req)
+		}
+	})
+}
+
+// bind binding an obj to a handler
+func bind(obj interface{}) http.HandlerFunc {
+	var tp = reflect.TypeOf(obj)
+	for tp.Kind() == reflect.Ptr {
+		tp = tp.Elem()
 	}
+	return web.Wrap(func(ctx *context.PrivateContext) {
+		var theObj = reflect.New(tp).Interface() // create a new form obj for every request but not use obj directly
+		binding.Bind(ctx.Req, theObj)
+		web.SetForm(ctx, theObj)
+	})
 }
 
-// RegisterRoutes registers all internal APIs routes to web application.
+// Routes registers all internal APIs routes to web application.
 // These APIs will be invoked by internal commands for example `gitea serv` and etc.
-func RegisterRoutes(m *macaron.Macaron) {
-	bind := binding.Bind
-
-	m.Group("/", func() {
-		m.Post("/ssh/authorized_keys", AuthorizedPublicKeyByContent)
-		m.Post("/ssh/:id/update/:repoid", UpdatePublicKeyInRepo)
-		m.Post("/hook/pre-receive/:owner/:repo", bind(private.HookOptions{}), HookPreReceive)
-		m.Post("/hook/post-receive/:owner/:repo", bind(private.HookOptions{}), HookPostReceive)
-		m.Post("/hook/set-default-branch/:owner/:repo/:branch", SetDefaultBranch)
-		m.Get("/serv/none/:keyid", ServNoCommand)
-		m.Get("/serv/command/:keyid/:owner/:repo", ServCommand)
-		m.Post("/manager/shutdown", Shutdown)
-		m.Post("/manager/restart", Restart)
-		m.Post("/manager/flush-queues", bind(private.FlushOptions{}), FlushQueues)
-		m.Post("/manager/pause-logging", PauseLogging)
-		m.Post("/manager/resume-logging", ResumeLogging)
-		m.Post("/manager/release-and-reopen-logging", ReleaseReopenLogging)
-		m.Post("/manager/add-logger", bind(private.LoggerOptions{}), AddLogger)
-		m.Post("/manager/remove-logger/:group/:name", RemoveLogger)
-		m.Post("/mail/send", SendEmail)
-	}, CheckInternalToken)
+func Routes() *web.Route {
+	var r = web.NewRoute()
+	r.Use(context.PrivateContexter())
+	r.Use(CheckInternalToken)
+
+	r.Post("/ssh/authorized_keys", AuthorizedPublicKeyByContent)
+	r.Post("/ssh/{id}/update/{repoid}", UpdatePublicKeyInRepo)
+	r.Post("/hook/pre-receive/{owner}/{repo}", bind(private.HookOptions{}), HookPreReceive)
+	r.Post("/hook/post-receive/{owner}/{repo}", bind(private.HookOptions{}), HookPostReceive)
+	r.Post("/hook/set-default-branch/{owner}/{repo}/{branch}", SetDefaultBranch)
+	r.Get("/serv/none/{keyid}", ServNoCommand)
+	r.Get("/serv/command/{keyid}/{owner}/{repo}", ServCommand)
+	r.Post("/manager/shutdown", Shutdown)
+	r.Post("/manager/restart", Restart)
+	r.Post("/manager/flush-queues", bind(private.FlushOptions{}), FlushQueues)
+	r.Post("/manager/pause-logging", PauseLogging)
+	r.Post("/manager/resume-logging", ResumeLogging)
+	r.Post("/manager/release-and-reopen-logging", ReleaseReopenLogging)
+	r.Post("/manager/add-logger", bind(private.LoggerOptions{}), AddLogger)
+	r.Post("/manager/remove-logger/{group}/{name}", RemoveLogger)
+	r.Post("/mail/send", SendEmail)
+
+	return r
 }