diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java index a631e77..09dad06 100644 --- a/src/main/java/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java +++ b/src/main/java/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java @@ -30,6 +30,7 @@ import io.kamax.mxisd.auth.provider.AuthenticatorProvider; import io.kamax.mxisd.auth.provider.BackendAuthResult; import io.kamax.mxisd.config.MatrixConfig; import io.kamax.mxisd.config.ldap.LdapConfig; +import io.kamax.mxisd.util.GsonUtil; import org.apache.commons.lang.StringUtils; import org.apache.directory.api.ldap.model.cursor.CursorException; import org.apache.directory.api.ldap.model.cursor.CursorLdapReferralException; @@ -107,6 +108,10 @@ public class LdapAuthProvider extends LdapGenericBackend implements Authenticato String[] attArray = new String[attributes.size()]; attributes.toArray(attArray); + log.debug("Base DN: {}", getBaseDn()); + log.debug("Query: {}", userFilter); + log.debug("Attributes: {}", GsonUtil.build().toJson(attArray)); + try (EntryCursor cursor = conn.search(getBaseDn(), userFilter, SearchScope.SUBTREE, attArray)) { while (cursor.next()) { Entry entry = cursor.get(); diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java index a5fbad9..ec1a247 100644 --- a/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java +++ b/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java @@ -26,6 +26,7 @@ import io.kamax.mxisd.config.ldap.LdapConfig; import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult; import io.kamax.mxisd.directory.IDirectoryProvider; import io.kamax.mxisd.exception.InternalServerError; +import io.kamax.mxisd.util.GsonUtil; import org.apache.directory.api.ldap.model.cursor.CursorException; import org.apache.directory.api.ldap.model.cursor.CursorLdapReferralException; import org.apache.directory.api.ldap.model.cursor.EntryCursor; @@ -70,9 +71,12 @@ public class LdapDirectoryProvider extends LdapGenericBackend implements IDirect attributes.add(getUidAtt()); String[] attArray = new String[attributes.size()]; attributes.toArray(attArray); - String searchQuery = buildOrQueryWithFilter(getCfg().getDirectory().getFilter(), "*" + query + "*", attArray); + + log.debug("Base DN: {}", getBaseDn()); log.debug("Query: {}", searchQuery); + log.debug("Attributes: {}", GsonUtil.build().toJson(attArray)); + try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, attArray)) { while (cursor.next()) { Entry entry = cursor.get(); diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java index cf289c9..7835e7f 100644 --- a/src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java +++ b/src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java @@ -27,6 +27,7 @@ import io.kamax.mxisd.lookup.SingleLookupReply; import io.kamax.mxisd.lookup.SingleLookupRequest; import io.kamax.mxisd.lookup.ThreePidMapping; import io.kamax.mxisd.lookup.provider.IThreePidProvider; +import io.kamax.mxisd.util.GsonUtil; import org.apache.directory.api.ldap.model.cursor.CursorException; import org.apache.directory.api.ldap.model.cursor.CursorLdapReferralException; import org.apache.directory.api.ldap.model.cursor.EntryCursor; @@ -78,6 +79,10 @@ public class LdapThreePidProvider extends LdapGenericBackend implements IThreePi String tPidQuery = tPidQueryOpt.get().replaceAll(getCfg().getIdentity().getToken(), value); String searchQuery = buildWithFilter(tPidQuery, getCfg().getIdentity().getFilter()); + log.debug("Base DN: {}", getBaseDn()); + log.debug("Query: {}", searchQuery); + log.debug("Attributes: {}", GsonUtil.build().toJson(getUidAtt())); + try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, getUidAtt())) { while (cursor.next()) { Entry entry = cursor.get();