From 522cfca0af31ed13e2a20abbfd80c53586529c0b Mon Sep 17 00:00:00 2001
From: UlricQin <ulric.qin@gmail.com>
Date: Mon, 2 Nov 2020 13:27:23 +0800
Subject: [PATCH] login fail, check your username and password

---
 src/models/ldap.go | 8 ++++++--
 src/models/user.go | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/models/ldap.go b/src/models/ldap.go
index d4d8bae6..a9bfce2f 100644
--- a/src/models/ldap.go
+++ b/src/models/ldap.go
@@ -6,6 +6,8 @@ import (
 
 	"gopkg.in/ldap.v3"
 
+	"github.com/toolkits/pkg/logger"
+
 	"github.com/didi/nightingale/src/modules/rdb/config"
 )
 
@@ -73,7 +75,8 @@ func ldapReq(user, pass string) (*ldap.SearchResult, error) {
 	}
 
 	if len(sr.Entries) == 0 {
-		return nil, fmt.Errorf("cannot find such user: %v", user)
+		logger.Infof("ldap auth fail, no such user: %s", user)
+		return nil, fmt.Errorf("login fail, check your username and password")
 	}
 
 	if len(sr.Entries) > 1 {
@@ -81,7 +84,8 @@ func ldapReq(user, pass string) (*ldap.SearchResult, error) {
 	}
 
 	if err := conn.Bind(sr.Entries[0].DN, pass); err != nil {
-		return nil, fmt.Errorf("password error")
+		logger.Info("ldap auth fail, password error, user: %s", user)
+		return nil, fmt.Errorf("login fail, check your username and password")
 	}
 	return sr, nil
 }
diff --git a/src/models/user.go b/src/models/user.go
index c13ca19b..5d2e568e 100644
--- a/src/models/user.go
+++ b/src/models/user.go
@@ -122,7 +122,8 @@ func PassLogin(user, pass, clientIP string) error {
 	}
 
 	if !has {
-		return fmt.Errorf("user[%s] not found", user)
+		logger.Infof("password auth fail, no such user: %s", user)
+		return fmt.Errorf("login fail, check your username and password")
 	}
 
 	loginPass, err := CryptoPass(pass)
@@ -131,7 +132,8 @@ func PassLogin(user, pass, clientIP string) error {
 	}
 
 	if loginPass != u.Password {
-		return fmt.Errorf("password error")
+		logger.Infof("password auth fail, password error, user: %s", user)
+		return fmt.Errorf("login fail, check your username and password")
 	}
 
 	go LoginLogNew(user, clientIP, "in")
-- 
GitLab