better debug messages

Author: Vladimir Kotal

plugins/src/main/java/opengrok/auth/entity/LdapUser.java

@@ -82,6 +82,6 @@ public String getDn() {
 
     @Override
     public String toString() {
-        return "LdapUser{dn=" + dn + ",attributes=" + attributes + '}';
+        return "LdapUser{dn=" + dn + "; attributes=" + attributes + '}';
     }
 }

plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java

@@ -129,13 +129,13 @@ public void fillSession(HttpServletRequest req, User user) {
         }
 
         String expandedFilter = expandFilter(ldapFilter, ldapUser, user);
-        LOGGER.log(Level.FINEST, "expanded filter for user {0} and LDAP user {1} into ''{2}''",
-                new Object[]{user, ldapUser, expandedFilter});
+        LOGGER.log(Level.FINEST, "expanded filter ''{0}'' for user {1} and LDAP user {2} into ''{3}''",
+                new Object[]{ldapFilter, user, ldapUser, expandedFilter});
         AbstractLdapProvider ldapProvider = getLdapProvider();
         try {
             if ((ldapProvider.lookupLdapContent(null, expandedFilter)) == null) {
                 LOGGER.log(Level.WARNING,
-                        "failed to get content for LDAP user {0} with filter {1} on {2}",
+                        "failed to get content for LDAP user {0} with filter ''{1}'' on {2}",
                         new Object[]{ldapUser, expandedFilter, ldapProvider});
                 return;
             }
@@ -166,11 +166,14 @@ String expandFilter(String filter, LdapUser ldapUser, User user) {
 
         for (Entry<String, Set<String>> entry : ldapUser.getAttributes().entrySet()) {
             if (entry.getValue().size() == 1) {
+                String name = entry.getKey();
+                String value = entry.getValue().iterator().next();
                 try {
-                    filter = replace(filter, entry.getKey(),
-                            entry.getValue().iterator().next(), transforms);
+                    filter = replace(filter, name, value, transforms);
                 } catch (PatternSyntaxException ex) {
-                    LOGGER.log(Level.WARNING, "The pattern for expanding is not valid", ex);
+                    LOGGER.log(Level.WARNING,
+                            String.format("Failed to expand filter ''%s'' with name ''%s'' and value ''%s''",
+                                    filter, name, value), ex);
                 }
             }
         }