yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-07 09:44:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

禁用用户不同步

Browse Source
This commit is contained in:
xxx 2023-12-26 15:34:56 +08:00
parent 8d03678e71
commit 1e92f19923
3 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playedu-common/src/main/java/xyz/playedu/common/bus/LDAPBus.java
View File

@ -180,6 +180,9 @@ public class LDAPBus {
String defaultAvatar = appConfigService.defaultAvatar(); String defaultAvatar = appConfigService.defaultAvatar();
for (LdapTransformUser ldapTransformUser : userList) { for (LdapTransformUser ldapTransformUser : userList) {
if (ldapTransformUser.isBan()) {
continue;
}
singleUserSync(ldapTransformUser, defaultAvatar); singleUserSync(ldapTransformUser, defaultAvatar);
} }
} }

2
playedu-common/src/main/java/xyz/playedu/common/util/ldap/LdapTransformUser.java
View File

@ -32,4 +32,6 @@ public class LdapTransformUser {
private String email; private String email;
private String uid; private String uid;
private boolean ban;
} }

77
playedu-common/src/main/java/xyz/playedu/common/util/ldap/LdapUtil.java
View File

@ -41,25 +41,34 @@ public class LdapUtil {
"(|(objectClass=person)(objectClass=posixAccount)(objectClass=inetOrgPerson)(objectClass=organizationalPerson)(objectClass=user))"; "(|(objectClass=person)(objectClass=posixAccount)(objectClass=inetOrgPerson)(objectClass=organizationalPerson)(objectClass=user))";
private static final String[] USER_RETURN_ATTRS = private static final String[] USER_RETURN_ATTRS =
new String[]{ new String[] {
// OpenLDAP 的属性 // OpenLDAP 的属性
"uid", // 用户的唯一识别符号，全局唯一，可以看做用户表的手机号，此字段可用于配合密码直接登录 "uid", // 用户的唯一识别符号，全局唯一，可以看做用户表的手机号，此字段可用于配合密码直接登录
"cn", // CommonName -> 可以认作为人的名字，比如：张三。在LDAP中此字段是可以重复的,但是同一ou下不可重复 "cn", // CommonName -> 可以认作为人的名字，比如：张三。在LDAP中此字段是可以重复的,但是同一ou下不可重复
"email", // 邮箱，同上 "email", // 邮箱，同上
"entryUUID", "entryUUID",
// Window AD 域的属性 // Window AD 域的属性
"name", "name",
"userPrincipalName", "userPrincipalName",
"distinguishedName", "distinguishedName",
"sAMAccountName", "sAMAccountName",
"displayName", "displayName",
"uSNCreated", // AD域的唯一属性 "uSNCreated", // AD域的唯一属性
"userAccountControl",
// 公用属性 // 公用属性
"mail", "mail",
}; };
private static final String[] OU_RETURN_ATTRS = new String[]{"ou", "usncreated"}; private static final String[] OU_RETURN_ATTRS = new String[] {"ou", "usncreated"};
// 514 - 禁用账户
// 546 - 禁用账户 不需密码
// 66050 - 禁用账户 密码未过期
// 66080 - 禁用账户 密码未过期且不需密码
// 66082 - 禁用账户 密码未过期且不需密码
private static final String[] DISABLE_USER_ACCOUNT_CONTROL =
new String[] {"514", "546", "66050", "66080", "66082"};
public static LdapContext initContext(String url, String adminUser, String adminPass) public static LdapContext initContext(String url, String adminUser, String adminPass)
throws NamingException { throws NamingException {
@ -75,7 +84,8 @@ public class LdapUtil {
} }
public static List<LdapTransformUser> users( public static List<LdapTransformUser> users(
String url, String adminUser, String adminPass, String baseDN) throws NamingException, IOException { String url, String adminUser, String adminPass, String baseDN)
throws NamingException, IOException {
LdapContext ldapContext = initContext(url, adminUser, adminPass); LdapContext ldapContext = initContext(url, adminUser, adminPass);
int pageSize = 1000; int pageSize = 1000;
@ -91,21 +101,24 @@ public class LdapUtil {
while (true) { while (true) {
try { try {
if (cookie != null) { if (cookie != null) {
ldapContext.setRequestControls(new Control[]{ ldapContext.setRequestControls(
new PagedResultsControl(pageSize, cookie, false), new Control[] {
}); new PagedResultsControl(pageSize, cookie, false),
});
} else { } else {
ldapContext.setRequestControls(new Control[]{ ldapContext.setRequestControls(
new PagedResultsControl(pageSize, false) new Control[] {new PagedResultsControl(pageSize, false)});
});
} }
NamingEnumeration<SearchResult> result = ldapContext.search(baseDN, USER_OBJECT_CLASS, controls); NamingEnumeration<SearchResult> result =
ldapContext.search(baseDN, USER_OBJECT_CLASS, controls);
while (result.hasMoreElements()) { while (result.hasMoreElements()) {
SearchResult item = result.nextElement(); SearchResult item = result.nextElement();
if (item != null) { if (item != null) {
LdapTransformUser ldapTransformUser = parseTransformUser(item, baseDN); LdapTransformUser ldapTransformUser = parseTransformUser(item, baseDN);
users.add(ldapTransformUser); if (ldapTransformUser != null) {
users.add(ldapTransformUser);
}
} }
} }
@ -283,6 +296,16 @@ public class LdapUtil {
LdapTransformUser ldapUser = new LdapTransformUser(); LdapTransformUser ldapUser = new LdapTransformUser();
ldapUser.setDn(item.getName()); ldapUser.setDn(item.getName());
if (attributes.get("userAccountControl") != null) {
String userAccountControl = (String) attributes.get("userAccountControl").get();
for (String s : DISABLE_USER_ACCOUNT_CONTROL) {
if (s.equals(userAccountControl)) {
ldapUser.setBan(true);
break;
}
}
}
// name解析 // name解析
String displayName = getAttribute(attributes, "displayName"); String displayName = getAttribute(attributes, "displayName");
if (StringUtil.isEmpty(displayName)) { if (StringUtil.isEmpty(displayName)) {
@ -311,8 +334,8 @@ public class LdapUtil {
String baseDNOuScope = baseDNOuScope(baseDN); String baseDNOuScope = baseDNOuScope(baseDN);
String[] rdnList = String[] rdnList =
(baseDNOuScope.isEmpty() (baseDNOuScope.isEmpty()
? ldapUser.getDn().toLowerCase() ? ldapUser.getDn().toLowerCase()
: ldapUser.getDn().toLowerCase() + "," + baseDNOuScope) : ldapUser.getDn().toLowerCase() + "," + baseDNOuScope)
.split(","); .split(",");
List<String> ou = new ArrayList<>(); List<String> ou = new ArrayList<>();
for (String s : rdnList) { for (String s : rdnList) {