aboutsummaryrefslogtreecommitdiffstats
path: root/routers/common/middleware.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-12-24 16:50:49 +0000
committerGitHub <noreply@github.com>2021-12-25 00:50:49 +0800
commit16adaaeaa3d6ebe19e203e5626120ed1cd4fea6c (patch)
tree7a95791e32336c53bfe75544b5dac4e6b31cc800 /routers/common/middleware.go
parent26070eb818a09e7123c178434e73c9def88ea8e7 (diff)
downloadgitea-16adaaeaa3d6ebe19e203e5626120ed1cd4fea6c.tar.gz
gitea-16adaaeaa3d6ebe19e203e5626120ed1cd4fea6c.zip
Instead of using routerCtx just escape the url before routing (#18086)
A consequence of forcibly setting the RoutePath to the escaped url is that the auto routing to endpoints without terminal slashes fails (Causing #18060.) This failure raises the possibility that forcibly setting the RoutePath causes other unexpected behaviors 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 #17938 Fix #18060 Replace #18062 Replace #17997 Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers/common/middleware.go')
-rw-r--r--routers/common/middleware.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/routers/common/middleware.go b/routers/common/middleware.go
index 7da05d2ae4..3f535628aa 100644
--- a/routers/common/middleware.go
+++ b/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))