From 766272b1542bddf1acfabce32ca902b584f8110c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 28 Sep 2021 21:42:43 +0800 Subject: [PATCH] Fix bug of get context user (#17169) (#17172) Co-authored-by: 6543 <6543@obermui.de> --- modules/context/context.go | 11 +++++++++++ routers/web/base.go | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/context/context.go b/modules/context/context.go index 52756fc02..568865d90 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -587,6 +587,17 @@ func GetContext(req *http.Request) *Context { return req.Context().Value(contextKey).(*Context) } +// GetContextUser returns context user +func GetContextUser(req *http.Request) *models.User { + if apiContext, ok := req.Context().Value(apiContextKey).(*APIContext); ok { + return apiContext.User + } + if ctx, ok := req.Context().Value(contextKey).(*Context); ok { + return ctx.User + } + return nil +} + // SignedUserName returns signed user's name via context func SignedUserName(req *http.Request) string { if middleware.IsInternalPath(req) { diff --git a/routers/web/base.go b/routers/web/base.go index f079be51f..af55cb4e9 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -14,7 +14,6 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/httpcache" "code.gitea.io/gitea/modules/log" @@ -147,15 +146,7 @@ func Recovery() func(next http.Handler) http.Handler { "i18n": lc, } - var user *models.User - if apiContext := context.GetAPIContext(req); apiContext != nil { - user = apiContext.User - } - if user == nil { - if ctx := context.GetContext(req); ctx != nil { - user = ctx.User - } - } + var user = context.GetContextUser(req) if user == nil { // Get user from session if logged in - do not attempt to sign-in user = auth.SessionUser(sessionStore)