mirror of
https://github.com/didi/KnowStreaming.git
synced 2025-12-24 03:42:07 +08:00
[Bugfix] 修复在Ldap登录时,设置auth-user-registration: false会导致空指针的问题 (#1117)
Configure LDAP And Set auth-user-registration: false will result in NPE(Null Pointer Exception) #1116 --------- Co-authored-by: weidong_chang <weidong_chang@intsig.net>
This commit is contained in:
@@ -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.bizenum.LoginServiceNameEnum;
|
||||||
import com.xiaojukeji.know.streaming.km.account.common.ldap.LdapPrincipal;
|
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.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.CommonUtils;
|
||||||
import com.xiaojukeji.know.streaming.km.common.utils.ConvertUtil;
|
|
||||||
import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils;
|
import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -80,6 +80,10 @@ public class LdapLoginServiceImpl implements LoginExtend {
|
|||||||
|
|
||||||
// user赋值
|
// user赋值
|
||||||
user = userService.getUserByUserName(ldapAttrsInfo.getSAMAccountName());
|
user = userService.getUserByUserName(ldapAttrsInfo.getSAMAccountName());
|
||||||
|
} else if (ValidateUtils.isNull(user)) {
|
||||||
|
// user为空,且不自动注册用户时,赋值默认id给临时用户
|
||||||
|
user = new User();
|
||||||
|
user.setId(Constant.INVALID_CODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 记录登录状态
|
// 记录登录状态
|
||||||
|
|||||||
Reference in New Issue
Block a user