fix: label when using ext. ldap search fields

fix: fill all columns with result data

Author: mightymop

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0</version>
+        <version>4.6.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>search</artifactId>

src/java/org/jivesoftware/openfire/plugin/SearchPlugin.java

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,8 +31,13 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.TreeMap;
 
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.ldap.Rdn;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
@@ -43,8 +49,10 @@
 import org.jivesoftware.openfire.disco.IQDiscoItemsHandler;
 import org.jivesoftware.openfire.group.Group;
 import org.jivesoftware.openfire.group.GroupManager;
+import org.jivesoftware.openfire.ldap.LdapManager;
 import org.jivesoftware.openfire.user.User;
 import org.jivesoftware.openfire.user.UserManager;
+import org.jivesoftware.util.Base64;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.util.PropertyEventDispatcher;
@@ -403,7 +411,15 @@ private IQ processGetPacket(IQ packet) {
             field.setVariable(searchField);
             field.setType(FormField.Type.boolean_type);
             field.addValue("1");
-            field.setLabel(LocaleUtils.getLocalizedString("advance.user.search." + searchField.toLowerCase(), "search"));
+            String strlabel = LocaleUtils.getLocalizedString("advance.user.search." + searchField.toLowerCase(), "search");
+            if (strlabel!=null&&!strlabel.startsWith("???advance.user.search"))
+            {
+                field.setLabel(strlabel);
+            }
+            else
+            {
+                field.setLabel(searchField);
+            }
             field.setRequired(false);
         }
 
@@ -736,23 +752,66 @@ private IQ replyDataFormResult(Collection<User> users, IQ packet) {
         searchResults.addReportedField("jid", "JID", FormField.Type.jid_single);
 
         for (final String fieldName : getFilteredSearchFields()) {
-            searchResults.addReportedField(fieldName,
-                    LocaleUtils.getLocalizedString("advance.user.search." + fieldName.toLowerCase(), "search"), FormField.Type.text_single);
+            String strlabel = LocaleUtils.getLocalizedString("advance.user.search." + fieldName.toLowerCase(), "search");
+            if (strlabel!=null&&!strlabel.startsWith("???advance.user.search"))
+            {
+                searchResults.addReportedField(fieldName,strlabel, FormField.Type.text_single);
+            }
+            else
+            {
+                searchResults.addReportedField(fieldName,fieldName, FormField.Type.text_single);
+            }
         }
 
         for (final User user : users) {
             final String username = JID.unescapeNode(user.getUsername());
 
             final LinkedHashMap<String, Object> item = new  LinkedHashMap<String, Object>();
+
             item.put("jid", username + "@" + serverName);
 
-            item.put(LocaleUtils.getLocalizedString("advance.user.search.username", "search"), username);
+            String ldapsearchfields = JiveGlobals.getProperty("ldap.searchFields",null);
+            if (ldapsearchfields!=null)
+            {
+                HashMap<String,String> fields = new LinkedHashMap<String,String>();
+                ArrayList<String> attrList = new ArrayList<String>();
+                try
+                {
+                    for (StringTokenizer i=new StringTokenizer(ldapsearchfields, ","); i.hasMoreTokens();)
+                    {
+                        String[] field = i.nextToken().split("/");
+                        fields.put(field[0], field[1]);
+                        attrList.add(field[1]);
+                    }
+                    Log.debug("fill fields: "+fields.toString());
+                }
+                catch (Exception e)
+                {
+                    fields=null;
+                    Log.error("Error parsing LDAP search fields: " + ldapsearchfields, e);
+                }
+
+                if (fields!=null)
+                {
+                    Map<String,String> listattr = getLdapAttributes(username,attrList.toArray(new String[attrList.size()]));
+
+                    for (String str : userManager.getSearchFields())
+                    {
+                        Log.debug("ATTR: "+fields.get(str)+" = "+listattr.get(fields.get(str)));
+                        item.put(str,  listattr.get(fields.get(str)));
+                    }
+                }
+            }
+            else
+            {
+                item.put(LocaleUtils.getLocalizedString("advance.user.search.username", "search"), username);
 
-            item.put(LocaleUtils.getLocalizedString("advance.user.search.name", "search"),
-                    (user.isNameVisible() ? removeNull(user.getName()) : ""));
+                item.put(LocaleUtils.getLocalizedString("advance.user.search.name", "search"),
+                        (user.isNameVisible() ? removeNull(user.getName()) : ""));
 
-            item.put(LocaleUtils.getLocalizedString("advance.user.search.email", "search"),
-                    (user.isEmailVisible() ? removeNull(user.getEmail()) : ""));
+                item.put(LocaleUtils.getLocalizedString("advance.user.search.email", "search"),
+                        (user.isEmailVisible() ? removeNull(user.getEmail()) : ""));
+            }
 
             searchResults.addItemFields(item);
         }
@@ -764,6 +823,58 @@ private IQ replyDataFormResult(Collection<User> users, IQ packet) {
         return replyPacket;
     }
 
+    private Map<String, String> getLdapAttributes(String username, String[] attrlist) {
+        // Un-escape username
+        username = JID.unescapeNode(username);
+        Map<String, String> map = new HashMap<>();
+
+        DirContext ctx = null;
+
+        LdapManager manager = LdapManager.getInstance();
+        try {
+            Log.debug("find userDN from "+username);
+            Rdn[] userRDN = manager.findUserRDN(username);
+
+            ctx = manager.getContext(manager.getUsersBaseDN(username));
+            Attributes attrs = ctx.getAttributes(LdapManager.escapeForJNDI(userRDN), attrlist);
+
+            for (String attribute : attrlist) {
+                javax.naming.directory.Attribute attr = attrs.get(attribute);
+                String value;
+                if (attr == null) {
+                    Log.debug("No ldap value found for attribute '" + attribute + "'");
+                    value = "";
+                }
+                else {
+                    Object ob = attrs.get(attribute).get();
+                    Log.debug("Found attribute "+attribute+" of type: "+ob.getClass());
+                    if(ob instanceof String) {
+                        value = (String)ob;
+                    } else {
+                        value = Base64.encodeBytes((byte[])ob);
+                    }
+                }
+                Log.debug("Ldap attribute '" + attribute + "'=>'" + value + "'");
+                map.put(attribute, value);
+            }
+            return map;
+        }
+        catch (Exception e) {
+            Log.error(e.getMessage(), e);
+            return Collections.emptyMap();
+        }
+        finally {
+            try {
+                if (ctx != null) {
+                    ctx.close();
+                }
+            }
+            catch (Exception e) {
+                // Ignore.
+            }
+        }
+    }
+
     /**
      * Constructs a query that is returned as an IQ packet that contains the search results.
      *