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

Update LDAP library to fix auth filter bug

Browse Source
This commit is contained in:
Maxime Dor
2017-09-17 14:01:38 +02:00
parent 23f717579e
commit 221d823f3b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application.example.yaml
View File

@@ -227,8 +227,6 @@ key.path: '/path/to/sign.key'
# #
# Example: (memberOf=CN=Matrix Users,CN=Users,DC=example,DC=org) # Example: (memberOf=CN=Matrix Users,CN=Users,DC=example,DC=org)
# #
# /!\ Currently NOT supported due to a possible bug in LDAP library /!\
#
#ldap.auth.filter: '' #ldap.auth.filter: ''

2
build.gradle
View File

@@ -83,7 +83,7 @@ dependencies {
compile 'net.i2p.crypto:eddsa:0.1.0' compile 'net.i2p.crypto:eddsa:0.1.0'
// LDAP connector // LDAP connector
compile 'org.apache.directory.api:api-all:1.0.0-RC2' compile 'org.apache.directory.api:api-all:1.0.0'
// DNS lookups // DNS lookups
compile 'dnsjava:dnsjava:2.1.8' compile 'dnsjava:dnsjava:2.1.8'

3
src/main/groovy/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java
View File

@@ -64,6 +64,9 @@ public class LdapAuthProvider extends LdapGenericBackend implements Authenticato
MatrixID mxIdExt = new MatrixID(id); MatrixID mxIdExt = new MatrixID(id);
String userFilterValue = StringUtils.equals(LdapThreePidProvider.UID, uidType) ? mxIdExt.getLocalPart() : mxIdExt.getId(); String userFilterValue = StringUtils.equals(LdapThreePidProvider.UID, uidType) ? mxIdExt.getLocalPart() : mxIdExt.getId();
String userFilter = "(" + getCfg().getAttribute().getUid().getValue() + "=" + userFilterValue + ")"; String userFilter = "(" + getCfg().getAttribute().getUid().getValue() + "=" + userFilterValue + ")";
if (!StringUtils.isBlank(getCfg().getAuth().getFilter())) {
userFilter = "(&" + getCfg().getAuth().getFilter() + userFilter + ")";
}
EntryCursor cursor = conn.search(getCfg().getConn().getBaseDn(), userFilter, SearchScope.SUBTREE, getUidAttribute(), getCfg().getAttribute().getName()); EntryCursor cursor = conn.search(getCfg().getConn().getBaseDn(), userFilter, SearchScope.SUBTREE, getUidAttribute(), getCfg().getAttribute().getName());
try { try {
while (cursor.next()) { while (cursor.next()) {