public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 12:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

no log ldap credentials

Browse Source
This commit is contained in:
MaxKey
2022-01-26 08:37:22 +08:00
parent c544b8b266
commit c3d2a4b94a
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
Object obj = results.nextElement();
if (obj instanceof SearchResult) {
SearchResult sr = (SearchResult) obj;
if("OU=Domain Controllers,DC=maxkey,DC=top".endsWith(sr.getNameInNamespace())) {
if(sr.getNameInNamespace().contains("OU=Domain Controllers")) {
_logger.info("Skip 'OU=Domain Controllers' .");
continue;
}
@@ -76,7 +76,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
NamingEnumeration<? extends Attribute> attrs = sr.getAttributes().getAll();
while (null != attrs && attrs.hasMoreElements()) {
Attribute objAttrs = attrs.nextElement();
_logger.trace("attribute "+objAttrs.getID() + " : " + objAttrs.get());
_logger.trace("attribute {} : {}" ,objAttrs.getID(), objAttrs.get());
attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs);
}

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

@@ -25,6 +25,7 @@ import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import org.apache.commons.lang3.StringUtils;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.constants.ldap.ActiveDirectoryUser;
import org.maxkey.entity.HistorySynchronizer;
import org.maxkey.entity.Organizations;
@@ -59,9 +60,9 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
Object obj = results.nextElement();
if (obj instanceof SearchResult) {
SearchResult sr = (SearchResult) obj;
if(sr.getNameInNamespace().indexOf("CN=Users,DC=maxkey,DC=top")>-1
||sr.getNameInNamespace().indexOf("OU=Domain Controllers,DC=maxkey,DC=top")>-1) {
_logger.info("to skip.");
if(sr.getNameInNamespace().contains("CN=Users,")
||sr.getNameInNamespace().contains("OU=Domain Controllers,")) {
_logger.trace("Skip 'CN=Users' or 'OU=Domain Controllers' . ");
continue;
}
_logger.debug("Sync User {} , name {} , NameInNamespace {}" ,
@@ -71,7 +72,7 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
NamingEnumeration<? extends Attribute> attrs = sr.getAttributes().getAll();
while (null != attrs && attrs.hasMoreElements()) {
Attribute objAttrs = attrs.nextElement();
_logger.trace("attribute "+objAttrs.getID() + " : " + objAttrs.get());
_logger.trace("attribute {} : {}" ,objAttrs.getID(), objAttrs.get());
attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs);
}
@@ -155,7 +156,7 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
userInfo.setUserState("RESIDENT");
userInfo.setUserType("EMPLOYEE");
userInfo.setTimeZone("Asia/Shanghai");
userInfo.setStatus(1);
userInfo.setStatus(ConstsStatus.ACTIVE);
userInfo.setInstId(this.synchronizer.getInstId());
HistorySynchronizer historySynchronizer =new HistorySynchronizer();
@@ -169,7 +170,6 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
historySynchronizer.setResult("success");
this.historySynchronizerService.insert(historySynchronizer);
} catch (NamingException e) {
e.printStackTrace();
}