From fab038b1752de59503c1ce3d8aea01b965a03db5 Mon Sep 17 00:00:00 2001 From: Gogs Date: Fri, 27 Feb 2015 12:42:03 +0000 Subject: Attempt #3 of ldap fixes --- routers/repo/http.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'routers/repo') diff --git a/routers/repo/http.go b/routers/repo/http.go index f5dc0c9d..35338fef 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -105,10 +105,10 @@ func Http(ctx *middleware.Context) { return } - authUser, err = models.GetUserByName(authUsername) + authUser, err := models.UserSignIn(authUsername, authPasswd) if err != nil { if err != models.ErrUserNotExist { - ctx.Handle(500, "GetUserByName", err) + ctx.Handle(500, "UserSignIn error: %v", err) return } @@ -128,12 +128,6 @@ func Http(ctx *middleware.Context) { return } authUsername = authUser.Name - } else { - // Check user's password when username is correctly presented. - if !authUser.ValidtePassword(authPasswd) { - ctx.Handle(401, "invalid password", nil) - return - } } if !isPublicPull { -- cgit v1.2.3