From a62290de52b5258b8f301c2f56ff84aa96e5f6d2 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 30 Dec 2015 21:29:30 -0500 Subject: #2311 improve HTTP auth error message --- routers/repo/http.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'routers/repo/http.go') diff --git a/routers/repo/http.go b/routers/repo/http.go index 8164f80962..c42f751572 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -131,7 +131,7 @@ func HTTP(ctx *middleware.Context) { } authUser, err = models.GetUserByID(token.UID) if err != nil { - ctx.Handle(500, "GetUserById", err) + ctx.Handle(500, "GetUserByID", err) return } authUsername = authUser.Name @@ -145,23 +145,26 @@ func HTTP(ctx *middleware.Context) { has, err := models.HasAccess(authUser, repo, tp) if err != nil { - ctx.HandleText(401, "no basic auth and digit auth") + ctx.Handle(500, "HasAccess", err) return } else if !has { if tp == models.ACCESS_MODE_READ { has, err = models.HasAccess(authUser, repo, models.ACCESS_MODE_WRITE) - if err != nil || !has { - ctx.HandleText(401, "no basic auth and digit auth") + if err != nil { + ctx.Handle(500, "HasAccess2", err) + return + } else if !has { + ctx.HandleText(403, "User permission denied") return } } else { - ctx.HandleText(401, "no basic auth and digit auth") + ctx.HandleText(403, "User permission denied") return } } if !isPull && repo.IsMirror { - ctx.HandleText(401, "mirror repository is read-only") + ctx.HandleText(403, "mirror repository is read-only") return } } -- cgit v1.2.3