tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take LDAP filter into account when doing 3PID lookups

Browse Source
This commit is contained in:
Maxime Dor
2017-12-16 19:17:22 +01:00
parent 16690a0329
commit 6571ff76b1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java
View File

@@ -68,13 +68,16 @@ public class LdapThreePidProvider extends LdapGenericBackend implements IThreePi
} }
private Optional<String> lookup(LdapConnection conn, String medium, String value) { private Optional<String> lookup(LdapConnection conn, String medium, String value) {
Optional<String> queryOpt = getCfg().getIdentity().getQuery(medium); Optional<String> tPidQueryOpt = getCfg().getIdentity().getQuery(medium);
if (!queryOpt.isPresent()) { if (!tPidQueryOpt.isPresent()) {
log.warn("{} is not a configured 3PID type for LDAP lookup", medium); log.warn("{} is not a configured 3PID type for LDAP lookup", medium);
return Optional.empty(); return Optional.empty();
} }
String searchQuery = queryOpt.get().replaceAll(getCfg().getIdentity().getToken(), value); // we merge 3PID specific query with global/specific filter, if one exists.
String tPidQuery = tPidQueryOpt.get().replaceAll(getCfg().getIdentity().getToken(), value);
String searchQuery = buildWithFilter(tPidQuery, getCfg().getIdentity().getFilter());
try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, getUidAtt())) { try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, getUidAtt())) {
while (cursor.next()) { while (cursor.next()) {
Entry entry = cursor.get(); Entry entry = cursor.get();