Instead of using routerCtx just escape the url before routing

A consequence of forcibly setting the RoutePath to the escaped url is that the
auto routing to endpoints without terminal slashes fails (Causing go-gitea#18060.) This
failure raises the possibility that forcibly setting the RoutePath causes other
unexpected behaviours too.

Therefore, instead we should simply pre-escape the URL in the process registering
handler. Then the request URL will be properly escaped for all the following calls.

Fix go-gitea#17938
Fix go-gitea#18060
Replace go-gitea#18062
Replace go-gitea#17997

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/context/context.go

@@ -610,9 +610,6 @@ func Contexter() func(next http.Handler) http.Handler {
 			var startTime = time.Now()
 			var link = setting.AppSubURL + strings.TrimSuffix(req.URL.EscapedPath(), "/")
 
-			chiCtx := chi.RouteContext(req.Context())
-			chiCtx.RoutePath = req.URL.EscapedPath()
-
 			var ctx = Context{
 				Resp:    NewResponse(resp),
 				Cache:   mc.GetCache(),

routers/common/middleware.go

@@ -23,6 +23,9 @@ func Middlewares() []func(http.Handler) http.Handler {
 	var handlers = []func(http.Handler) http.Handler{
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
+				// First of all escape the URL RawPath to ensure that all routing is done using a correctly escaped URL
+				req.URL.RawPath = req.URL.EscapedPath()
+
 				ctx, _, finished := process.GetManager().AddContext(req.Context(), fmt.Sprintf("%s: %s", req.Method, req.RequestURI))
 				defer finished()
 				next.ServeHTTP(context.NewResponse(resp), req.WithContext(ctx))

routers/web/web.go

@@ -1079,11 +1079,6 @@ func RegisterRoutes(m *web.Route) {
 		m.Get("/swagger.v1.json", SwaggerV1Json)
 	}
 	m.NotFound(func(w http.ResponseWriter, req *http.Request) {
-		escapedPath := req.URL.EscapedPath()
-		if len(escapedPath) > 1 && escapedPath[len(escapedPath)-1] == '/' {
-			http.Redirect(w, req, setting.AppSubURL+escapedPath[:len(escapedPath)-1], http.StatusTemporaryRedirect)
-			return
-		}
 		ctx := context.GetContext(req)
 		ctx.NotFound("", nil)
 	})