Attempt #3 of ldap fixes

diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index ad7ce5b9ada4b69f6edafe9ae9eab03131f7d15d..5b24591a6f3c6702b85d7efae14dba462bb571b0 100644 (file)
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -108,17 +108,16 @@ func SignedInUser(req *http.Request, sess session.Store) (*models.User, bool) {
                        auths := strings.Fields(baHead)
                        if len(auths) == 2 && auths[0] == "Basic" {
                                uname, passwd, _ := base.BasicAuthDecode(auths[1])
-                               u, err := models.GetUserByName(uname)
+
+                               u, err := models.UserSignIn(uname, passwd)
                                if err != nil {
                                        if err != models.ErrUserNotExist {
-                                               log.Error(4, "GetUserByName: %v", err)
+                                               log.Error(4, "UserSignIn: %v", err)
                                        }
                                        return nil, false
                                }
 
-                               if u.ValidtePassword(passwd) {
-                                       return u, true
-                               }
+                               return u, true
                        }
                }
                return nil, false

diff --git a/routers/repo/http.go b/routers/repo/http.go
index f5dc0c9d6aef61265037052bedafc61bb552ea08..35338fefbec2ddc4781088caa21da506a3000323 100644 (file)
--- 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 {