Browse Source

log ldap attribute values

MaxKey 3 năm trước cách đây
mục cha
commit
506a2200b0

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

@@ -291,14 +291,14 @@ public class LdapUtils {
     }
 
     public static String getAttrStringValue(Attributes attrs, String elem) {
-        String value = "";
+    	StringBuffer  values = new StringBuffer("");
         try {
             if (attrs.get(elem) != null) {
                 for (int i = 0; i < attrs.get(elem).size(); i++) {
                 	if(i == 0) {
-                		value += attrs.get(elem).get(i).toString();
+                		values.append(attrs.get(elem).get(i).toString());
                 	}else {
-                		value += "," + attrs.get(elem).get(i).toString();
+                		values.append(" , ").append(attrs.get(elem).get(i).toString());
                 	}
                 }
             }
@@ -306,7 +306,26 @@ public class LdapUtils {
             e.printStackTrace();
             _logger.error(e.getMessage());
         }
-        return value;
+        return values.toString();
+    }
+    
+    public static String getAttrStringValue(Attribute attr) {
+    	StringBuffer  values = new StringBuffer("");
+        try {
+            if (attr != null) {
+                for (int i = 0; i < attr.size(); i++) {
+                	if(i == 0) {
+                		values.append(attr.get(i).toString());
+                	}else {
+                		values.append(" , ").append(attr.get(i).toString());
+                	}
+                }
+            }
+        } catch (NamingException e) {
+            e.printStackTrace();
+            _logger.error(e.getMessage());
+        }
+        return values.toString();
     }
     
     public static String getAttributeStringValue(String attribute ,HashMap<String,Attribute> attributeMap) throws NamingException {

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

@@ -76,7 +76,10 @@ 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(), 
+													ActiveDirectoryUtils.getAttrStringValue(objAttrs)
+										);
 						attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs);
 					}
 					

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

@@ -72,7 +72,10 @@ 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(), 
+												ActiveDirectoryUtils.getAttrStringValue(objAttrs)
+									);
 						attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs);
 					}
 					

+ 4 - 1
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java

@@ -71,7 +71,10 @@ public class LdapOrganizationService extends AbstractSynchronizerService  implem
 					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(), 
+											LdapUtils.getAttrStringValue(objAttrs)
+								);
 						attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs);
 					}
 					

+ 4 - 1
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java

@@ -65,7 +65,10 @@ public class LdapUsersService extends AbstractSynchronizerService  implements IS
 					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(), 
+											LdapUtils.getAttrStringValue(objAttrs)
+								);
 						attributeMap.put(objAttrs.getID(), objAttrs);
 					}