UBO-363 Fixed NullPointerException in MCRUserMatcherLDAP (#426)

* UBO-363 Fixed NullPointerException in MCRUserMatcherLDAP * UBO-363 Improved logging of exceptions
MyCoRe-Org · Oct 24, 2024 · 821a230 · 821a230
1 parent 2c86acb
commit 821a230
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ubo-common/src/main/java/org/mycore/ubo/ldap/LDAPAuthenticator.java b/ubo-common/src/main/java/org/mycore/ubo/ldap/LDAPAuthenticator.java
@@ -118,11 +118,11 @@ private LdapContext getLDAPContext(String uid, String credentials, String dn) th
             return new InitialLdapContext(env, null);
         } catch (AuthenticationException ex) {
             if (ex.getMessage().contains(PATTERN_INVALID_CREDENTIALS)) {
-                LOGGER.info("Could not authenticate LDAP user " + uid + ": " + ex.getMessage());
-                return null;
+                LOGGER.error("Could not authenticate LDAP user {}:{}", uid, ex.getMessage());
             } else {
-                throw ex;
+                LOGGER.error("Error while creating {}", LdapContext.class.getSimpleName(), ex);
             }
+            return null;
         }
     }
 }
diff --git a/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java b/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java
@@ -477,15 +477,18 @@ public List<LDAPObject> getLDAPUsersByGivenLDAPAttributes(Multimap ldapAttribute
         String ldapSearchFilter = createLDAPSearchFilter(ldapAttributes, searchTemplate);
         try {
             ctx = new LDAPAuthenticator().authenticate();
+            if (ctx == null) {
+                return new ArrayList<>();
+            }
             ldapUsers = new LDAPSearcher().searchWithGlobalDN(ctx, ldapSearchFilter);
         } catch (NamingException ex) {
-            LOGGER.error("Exception occurred: " + ex);
+            LOGGER.error("Exception occurred during getting LDAP users", ex);
         } finally {
             if (ctx != null) {
                 try {
                     ctx.close();
                 } catch (NamingException ex) {
-                    LOGGER.warn("could not close context " + ex);
+                    LOGGER.warn("Could not close LDAP context", ex);
                 }
             }
         }