From ca696dd6e1953b7ad9cdbdfd336ff1655a94870f Mon Sep 17 00:00:00 2001 From: chang-wd <51365967+chang-wd@users.noreply.github.com> Date: Tue, 8 Aug 2023 14:49:25 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=9C=A8Ldap?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AEauth-user?= =?UTF-8?q?-registration:=20false=E4=BC=9A=E5=AF=BC=E8=87=B4=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98=20(#1117)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Configure LDAP And Set auth-user-registration: false will result in NPE(Null Pointer Exception) #1116 --------- Co-authored-by: weidong_chang --- .../km/account/login/ldap/LdapLoginServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/km-extends/km-account/src/main/java/com/xiaojukeji/know/streaming/km/account/login/ldap/LdapLoginServiceImpl.java b/km-extends/km-account/src/main/java/com/xiaojukeji/know/streaming/km/account/login/ldap/LdapLoginServiceImpl.java index 64dc78ad..aa56d842 100644 --- a/km-extends/km-account/src/main/java/com/xiaojukeji/know/streaming/km/account/login/ldap/LdapLoginServiceImpl.java +++ b/km-extends/km-account/src/main/java/com/xiaojukeji/know/streaming/km/account/login/ldap/LdapLoginServiceImpl.java @@ -16,8 +16,8 @@ import com.xiaojukeji.know.streaming.km.account.KmAccountConfig; import com.xiaojukeji.know.streaming.km.account.common.bizenum.LoginServiceNameEnum; import com.xiaojukeji.know.streaming.km.account.common.ldap.LdapPrincipal; import com.xiaojukeji.know.streaming.km.account.login.ldap.remote.LdapAuthentication; +import com.xiaojukeji.know.streaming.km.common.constant.Constant; import com.xiaojukeji.know.streaming.km.common.utils.CommonUtils; -import com.xiaojukeji.know.streaming.km.common.utils.ConvertUtil; import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,6 +80,10 @@ public class LdapLoginServiceImpl implements LoginExtend { // user赋值 user = userService.getUserByUserName(ldapAttrsInfo.getSAMAccountName()); + } else if (ValidateUtils.isNull(user)) { + // user为空，且不自动注册用户时，赋值默认id给临时用户 + user = new User(); + user.setId(Constant.INVALID_CODE); } // 记录登录状态