tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Merge pull request #992 from theangryangel/fix/ldap-auth

Browse Source 
Attempt 3 to fix LDAP login issues when git pushing after password change
This commit is contained in:
无闻
2015-02-28 06:57:43 -05:00
parent 0d90a16d9f fab038b175
commit 3a6ba39a61
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
routers/repo/http.go
View File

@@ -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 {