From e7349161f39cada6238995a9adeda118e139074e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B0=91?= <tusu@tsign.cn>
Date: Tue, 9 Feb 2021 15:22:26 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20FIX:=E4=BF=AE=E6=94=B9LDAP=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=87=8D=E5=A4=8D=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/ldap/LDAPAuthentication.java       | 13 +++++++++++--
 .../account/component/sso/BaseSessionSignOn.java    |  4 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
index c1694b4c..2419901a 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
@@ -92,9 +92,10 @@ public class LDAPAuthentication {
         LdapContext ctx = getConnect();
 
         boolean valide = false;
-        String userDN = getUserDN(account,ctx);
+
         try {
-            assert ctx != null;
+            String userDN = getUserDN(account,ctx);
+
             ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN);
             ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, password);
             ctx.reconnect(null);
@@ -103,6 +104,14 @@ public class LDAPAuthentication {
             System.out.println(e.toString());
         } catch (NamingException e) {
             e.printStackTrace();
+        }finally {
+            if(ctx!=null) {
+                try {
+                    ctx.close();
+                } catch (NamingException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         return valide;
diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
index ec9324b9..25ca16e1 100644
--- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
+++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
@@ -56,7 +56,7 @@ public class BaseSessionSignOn extends AbstractSingleSignOn {
                 return null;
             }
 
-            if(authUserRegistration){
+            if(accountDO==null && authUserRegistration){
                 //自动注册
                 accountDO = new AccountDO();
                 accountDO.setUsername(dto.getUsername());
@@ -66,6 +66,8 @@ public class BaseSessionSignOn extends AbstractSingleSignOn {
                 return dto.getUsername();
             }
 
+            return dto.getUsername();
+
         }
 
         if (ValidateUtils.isNull(accountDO)) {