From 16adaaeaa3d6ebe19e203e5626120ed1cd4fea6c Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 24 Dec 2021 16:50:49 +0000 Subject: 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 --- modules/context/context.go | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/context') diff --git a/modules/context/context.go b/modules/context/context.go index 94e1f6cfff..5038850649 100644 --- a/modules/context/context.go +++ b/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(), -- cgit v1.2.3