Skip to content

[Bugfix] 修复配置ldap登录，并设置auth-user-registration: false的空指针异常 #1117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZQKC merged 2 commits into from
Aug 8, 2023
Merged

[Bugfix] 修复配置ldap登录，并设置auth-user-registration: false的空指针异常 #1117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bdc925
[Bugfix] 修复配置ldap登录，并设置auth-user-registration: false的空指针异常
Aug 7, 2023
9754ab8
[Bugfix] 修复创建历史用户判断条件 #1116
Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...c/main/java/com/xiaojukeji/know/streaming/km/account/login/ldap/LdapLoginServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
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;
Expand Down Expand Up @@ -80,6 +80,10 @@ public UserBriefVO verifyLogin(AccountLoginDTO loginDTO,

// user赋值
user = userService.getUserByUserName(ldapAttrsInfo.getSAMAccountName());
} else if (ValidateUtils.isNull(user)) {
// user为空，且不自动注册用户时，赋值默认id给临时用户
user = new User();
user.setId(Constant.INVALID_CODE);
}

// 记录登录状态
Expand Down