From a00816f7a5f5ea8f2a48411b10f5292fd0a11351 Mon Sep 17 00:00:00 2001
From: "Mr. Lan" <fdevops@163.com>
Date: Thu, 20 Aug 2020 22:37:41 +0800
Subject: [PATCH] =?UTF-8?q?ldap=E5=85=BC=E5=AE=B9uid=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/settings.dev.yml | 1 +
 config/settings.yml     | 1 +
 pkg/ldap/search.go      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/settings.dev.yml b/config/settings.dev.yml
index 2efb9de..b24f849 100644
--- a/config/settings.dev.yml
+++ b/config/settings.dev.yml
@@ -39,6 +39,7 @@ settings:
     host: localhost
     port: 389
     tls: 0
+    userfield: uid
   log:
     compress: 1
     consolestdout: 1
diff --git a/config/settings.yml b/config/settings.yml
index e78a90e..ff82a45 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -45,6 +45,7 @@ settings:
     host: localhost
     port: 389
     tls: 0
+    userfield: uid
   log:
     compress: 1
     consolestdout: 1
diff --git a/pkg/ldap/search.go b/pkg/ldap/search.go
index 80a87dd..ca0580f 100644
--- a/pkg/ldap/search.go
+++ b/pkg/ldap/search.go
@@ -72,7 +72,7 @@ func searchRequest(username string) (userInfo *ldap.Entry, err error) {
 		0,
 		0,
 		false,
-		fmt.Sprintf("(cn=%s)", username),
+		fmt.Sprintf("(%v=%v)", viper.GetString("settings.ldap.userField"), username),
 		ldapFieldsFilter,
 		nil)