Merge branch '530-ldap-user-exists' into 'devel_12.1.x'

Resolve "Ldap user exists, but is filtered out"

See merge request !447

service/src/main/java/lcsb/mapviewer/services/impl/LdapService.java

@@ -146,11 +146,11 @@ public class LdapService implements ILdapService {
           .getConfigurationValue(ConfigurationElementType.LDAP_LAST_NAME_ATTRIBUTE);
       String emailAttribute = configurationService.getConfigurationValue(ConfigurationElementType.LDAP_EMAIL_ATTRIBUTE);
 
-      Filter f1 = createLoginFilter(login);
+      Filter loginFilter = createLoginFilter(login);
       Filter f2 = createObjectClassFilter();
       Filter f3 = createAttributeFilter();
 
-      Filter filter = Filter.createANDFilter(f1, f2, f3);
+      Filter filter = Filter.createANDFilter(loginFilter, f2, f3);
       SearchResult searchResult = connection.search(baseDn, SearchScope.SUB, filter);
 
       for (SearchResultEntry entry : searchResult.getSearchEntries()) {
@@ -186,6 +186,10 @@ public class LdapService implements ILdapService {
 
         return result;
       }
+      searchResult = connection.search(baseDn, SearchScope.SUB, loginFilter);
+      if (searchResult.getSearchEntries().size() > 0) {
+        logger.debug("User '" + login + "' exists, but was filtered out [filter=" + filter.toString() + "]");
+      }
       return null;
     } finally {
       connection.close();