fix for empty 'namingAttr' for ldap authentication

Evolveum · Oct 18, 2023 · 8843ae8 · 8843ae8
1 parent 1275658
commit 8843ae8
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/...com/evolveum/midpoint/authentication/impl/filter/ldap/MidpointPrincipalContextMapper.java b/...com/evolveum/midpoint/authentication/impl/filter/ldap/MidpointPrincipalContextMapper.java
@@ -53,18 +53,21 @@ public MidpointPrincipalContextMapper() {
     public UserDetails mapUserFromContext(DirContextOperations ctx, String username,
             Collection<? extends GrantedAuthority> authorities) {
 
-        if (!(ctx instanceof LdapDirContextAdapter) || ((LdapDirContextAdapter) ctx).getNamingAttr() == null) {
-            LOGGER.debug("Couldn't define midpoint user");
+        if (!(ctx instanceof LdapDirContextAdapter)) {
+            LOGGER.debug("Wrong type of authentication context expected LdapDirContextAdapter, but was "
+                    + (ctx == null ? null : ctx.getClass()));
             throw new AuthenticationServiceException("web.security.provider.invalid");
         }
 
-        String userNameEffective;
-        try {
-            userNameEffective = resolveLdapName(ctx, username, ((LdapDirContextAdapter) ctx).getNamingAttr());
-        } catch (ObjectNotFoundException e) {
-            throw new UsernameNotFoundException("web.security.provider.invalid.credentials", e);
-        } catch (NamingException e) {
-            throw new SystemException(e.getMessage(), e);
+        String userNameEffective = username;
+        if (((LdapDirContextAdapter) ctx).getNamingAttr() != null){
+            try {
+                userNameEffective = resolveLdapName(ctx, username, ((LdapDirContextAdapter) ctx).getNamingAttr());
+            } catch (ObjectNotFoundException e) {
+                throw new UsernameNotFoundException("web.security.provider.invalid.credentials", e);
+            } catch (NamingException e) {
+                throw new SystemException(e.getMessage(), e);
+            }
         }
 
         Class<? extends FocusType> focusType = ((LdapDirContextAdapter) ctx).getFocusType();