no log ldap credentials

maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java

@@ -68,9 +68,10 @@ public class ActiveDirectoryUtils extends LdapUtils {
     @Override
     protected void initEnvironment() {
     	 if(props == null) {
- 	        _logger.info("PROVIDER_URL:" + providerUrl);
- 	        _logger.info("SECURITY_PRINCIPAL:" + principal);
- 	        _logger.info("SECURITY_CREDENTIALS:" + credentials);
+    		_logger.debug("PROVIDER_URL {}" , providerUrl);
+            _logger.debug("SECURITY_PRINCIPAL {}" , principal);
+            //no log credentials 
+            //_logger.trace("SECURITY_CREDENTIALS {}" , credentials);
  	        // LDAP
  	        props = new Properties();
  	        props.setProperty(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");

maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java

@@ -112,9 +112,10 @@ public class LdapUtils {
     protected void initEnvironment() {
     	// LDAP
         if(props == null) {
-        	 _logger.debug("PROVIDER_URL:" + providerUrl);
-             _logger.debug("SECURITY_PRINCIPAL:" + principal);
-             _logger.trace("SECURITY_CREDENTIALS:" + credentials);
+        	 _logger.debug("PROVIDER_URL {}" , providerUrl);
+             _logger.debug("SECURITY_PRINCIPAL {}" , principal);
+             //no log credentials 
+             //_logger.trace("SECURITY_CREDENTIALS {}" , credentials);
 	        props = new Properties();
 	        props.setProperty(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
 	        props.setProperty(Context.URL_PKG_PREFIXES, "com.sun.jndi.url");

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

@@ -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);
 					}
 					

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

@@ -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();
 		}