From 0d3d9675c62b3ad7ebcfd7a7515bbe9c3c769262 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 12 Apr 2022 04:02:58 +0200 Subject: [PATCH] Fix middleware function's placements for some `/user/...` (#19377) - Add reqSignIn to `/user/task/{task}` as it specific to a logged in user currently not-logged in user could cause a NPE. - Move `/user/stopwatch` & `/user/search` middleware before the actual function is called, because functions are executed in order and currently hadn't any effect and could as well cause a NPE due to that. - Remove `/user/active` reqSignIn middleware, because when you want to active a account you're not "signed in" so it doesn't make sense to add that middleware. --- routers/web/web.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index 190ab099e05..0de6f137227 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -429,8 +429,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/user", func() { // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) - m.Get("/activate", auth.Activate, reqSignIn) - m.Post("/activate", auth.ActivatePost, reqSignIn) + m.Get("/activate", auth.Activate) + m.Post("/activate", auth.ActivatePost) m.Any("/activate_email", auth.ActivateEmail) m.Get("/avatar/{username}/{size}", user.AvatarByUserName) m.Get("/recover_account", auth.ResetPasswd) @@ -438,9 +438,9 @@ func RegisterRoutes(m *web.Route) { m.Get("/forgot_password", auth.ForgotPasswd) m.Post("/forgot_password", auth.ForgotPasswdPost) m.Post("/logout", auth.SignOut) - m.Get("/task/{task}", user.TaskStatus) - m.Get("/stopwatches", user.GetStopwatches, reqSignIn) - m.Get("/search", user.Search, ignExploreSignIn) + m.Get("/task/{task}", reqSignIn, user.TaskStatus) + m.Get("/stopwatches", reqSignIn, user.GetStopwatches) + m.Get("/search", ignExploreSignIn, user.Search) }) // ***** END: User *****