admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

LDAP Synchronize fix

Browse Source
This commit is contained in:
MaxKey 2022-09-09 20:49:54 +08:00
parent 03a8ae6f04
commit d00feb32ea
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java
View File

@ -180,7 +180,11 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
try { try {
Organizations org = new Organizations(); Organizations org = new Organizations();
org.setLdapDn(nameInNamespace); org.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/"); String []namePaths = name.replaceAll(",OU=" , "/")
.replaceAll("OU=" , "/")
.replaceAll(",ou=" , "/")
.replaceAll("ou=" , "/")
.split("/");
String namePah= "/"+rootOrganization.getOrgName(); String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) { for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i]; namePah = namePah + "/" + namePaths[i];

7
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java
View File

@ -119,7 +119,12 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
UserInfo userInfo = new UserInfo(); UserInfo userInfo = new UserInfo();
userInfo.setLdapDn(nameInNamespace); userInfo.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/"); String []namePaths = name.replaceAll(",OU=" , "/")
.replaceAll("OU=" , "/")
.replaceAll(",ou=" , "/")
.replaceAll("ou=" , "/")
.split("/");
String namePah= "/"+rootOrganization.getOrgName(); String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) { for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i]; namePah = namePah + "/" + namePaths[i];

7
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java
View File

@ -174,7 +174,12 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
try { try {
Organizations org = new Organizations(); Organizations org = new Organizations();
org.setLdapDn(nameInNamespace); org.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/"); String []namePaths = name.replaceAll(",OU=" , "/")
.replaceAll("OU=" , "/")
.replaceAll(",ou=" , "/")
.replaceAll("ou=" , "/")
.split("/");
String namePah= "/"+rootOrganization.getOrgName(); String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) { for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i]; namePah = namePah + "/" + namePaths[i];

7
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java
View File

@ -52,6 +52,7 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
constraints.setSearchScope(ldapUtils.getSearchScope()); constraints.setSearchScope(ldapUtils.getSearchScope());
String filter = StringUtils.isNotBlank(this.getSynchronizer().getFilters()) ? String filter = StringUtils.isNotBlank(this.getSynchronizer().getFilters()) ?
getSynchronizer().getFilters() : "(&(objectClass=inetOrgPerson))"; getSynchronizer().getFilters() : "(&(objectClass=inetOrgPerson))";
_logger.debug(" User filter {} ",filter);
NamingEnumeration<SearchResult> results = NamingEnumeration<SearchResult> results =
ldapUtils.getConnection().search(ldapUtils.getBaseDN(), filter, constraints); ldapUtils.getConnection().search(ldapUtils.getBaseDN(), filter, constraints);
@ -110,7 +111,11 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
public UserInfo buildUserInfo(HashMap<String,Attribute> attributeMap,String name,String nameInNamespace) { public UserInfo buildUserInfo(HashMap<String,Attribute> attributeMap,String name,String nameInNamespace) {
UserInfo userInfo = new UserInfo(); UserInfo userInfo = new UserInfo();
userInfo.setLdapDn(nameInNamespace); userInfo.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/"); String []namePaths = name.replaceAll(",OU=" , "/")
.replaceAll("OU=" , "/")
.replaceAll(",ou=" , "/")
.replaceAll("ou=" , "/")
.split("/");
String namePah= "/"+rootOrganization.getOrgName(); String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) { for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i]; namePah = namePah + "/" + namePaths[i];