From 078dc47b39dff99be623ab90ddeaa53e10dc6175 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 23 Jul 2019 18:32:53 +0100 Subject: [PATCH 1/2] Handle ErrUserProhibitLogin in http git (#7586) --- routers/repo/http.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 48f562505131e..26376b549d0a0 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -215,7 +215,10 @@ func HTTP(ctx *context.Context) { // Check username and password authUser, err = models.UserSignIn(authUsername, authPasswd) if err != nil { - if !models.IsErrUserNotExist(err) { + if models.IsErrUserProhibitLogin(err) { + ctx.HandleText(http.StatusUnauthorized, "User is not permitted to login") + return + } else if !models.IsErrUserNotExist(err) { ctx.ServerError("UserSignIn error: %v", err) return } From 68e7dea89fee2c6f638b47df7ebaf1f961655c45 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 23 Jul 2019 20:33:20 +0100 Subject: [PATCH 2/2] Use 403 --- routers/repo/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 26376b549d0a0..a9a5cedc20792 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -216,7 +216,7 @@ func HTTP(ctx *context.Context) { authUser, err = models.UserSignIn(authUsername, authPasswd) if err != nil { if models.IsErrUserProhibitLogin(err) { - ctx.HandleText(http.StatusUnauthorized, "User is not permitted to login") + ctx.HandleText(http.StatusForbidden, "User is not permitted to login") return } else if !models.IsErrUserNotExist(err) { ctx.ServerError("UserSignIn error: %v", err)