From 2287f95a2101342f2e4c8720d2bd62cbf41f500f Mon Sep 17 00:00:00 2001 From: Najib Idrissi Date: Wed, 8 Aug 2018 12:51:13 +0200 Subject: [PATCH 1/2] Make reverse proxy auth optional If the option ENABLE_REVERSE_PROXY_AUTHENTICATION is enabled, make reverse proxy auth optional, instead of failing if the authentication did not succeed. Fixes #3973 Signed-off-by: Najib Idrissi --- routers/repo/http.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 1c3453a3a9827..7de0780013824 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -83,17 +83,14 @@ func HTTP(ctx *context.Context) { // check access if askAuth { - if setting.Service.EnableReverseProxyAuth { - authUsername = ctx.Req.Header.Get(setting.ReverseProxyAuthUser) - if len(authUsername) == 0 { - ctx.HandleText(401, "reverse proxy login error. authUsername empty") - return - } + authUsername = ctx.Req.Header.Get(setting.ReverseProxyAuthUser) + if setting.Service.EnableReverseProxyAuth && len(authUsername) > 0 { authUser, err = models.GetUserByName(authUsername) if err != nil { ctx.HandleText(401, "reverse proxy login error, got error while running GetUserByName") return } + } } else { authHead := ctx.Req.Header.Get("Authorization") if len(authHead) == 0 { From d99a48f3423f9aac19cb9ff52baca645780e43d5 Mon Sep 17 00:00:00 2001 From: Najib Idrissi Date: Wed, 8 Aug 2018 13:01:45 +0200 Subject: [PATCH 2/2] Update http.go --- routers/repo/http.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 7de0780013824..5b469754adf52 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -90,7 +90,6 @@ func HTTP(ctx *context.Context) { ctx.HandleText(401, "reverse proxy login error, got error while running GetUserByName") return } - } } else { authHead := ctx.Req.Header.Get("Authorization") if len(authHead) == 0 {