diff options
| author | 无闻 <u@gogs.io> | 2015-02-28 06:57:43 -0500 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-02-28 06:57:43 -0500 |
| commit | 3a6ba39a61c68d967c6c08aa087d2de2d0bf7ec0 (patch) | |
| tree | 32fbc2f0c074815ec6b899f43a9434d64787f8f2 /routers/repo/http.go | |
| parent | 0d90a16d9fb8d475ea56b5ac43d6e4ccc0ebaa7b (diff) | |
| parent | fab038b1752de59503c1ce3d8aea01b965a03db5 (diff) | |
| download | gitea-3a6ba39a61c68d967c6c08aa087d2de2d0bf7ec0.tar.gz gitea-3a6ba39a61c68d967c6c08aa087d2de2d0bf7ec0.zip | |
Merge pull request #992 from theangryangel/fix/ldap-auth
Attempt 3 to fix LDAP login issues when git pushing after password change
Diffstat (limited to 'routers/repo/http.go')
| -rw-r--r-- | routers/repo/http.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/routers/repo/http.go b/routers/repo/http.go index f5dc0c9d6a..35338fefbe 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 { |