LDAP Directory search support

src/main/java/io/kamax/mxisd/config/ldap/LdapConfig.java

@@ -21,7 +21,9 @@
 package io.kamax.mxisd.config.ldap;
 
 import com.google.gson.Gson;
-import io.kamax.mxisd.backend.ldap.LdapThreePidProvider;
+import io.kamax.matrix.ThreePidMedium;
+import io.kamax.mxisd.backend.ldap.LdapGenericBackend;
+import io.kamax.mxisd.exception.ConfigurationException;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,16 +37,31 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "ldap")
 public class LdapConfig {
 
+    private Logger log = LoggerFactory.getLogger(LdapConfig.class);
     private static Gson gson = new Gson();
 
-    private Logger log = LoggerFactory.getLogger(LdapConfig.class);
-
     private boolean enabled;
+    private String filter;
+
+    public static class Directory {
+
+        private String filter;
+
+        public String getFilter() {
+            return filter;
+        }
+
+        public void setFilter(String filter) {
+            this.filter = filter;
+        }
+
+    }
 
     @Autowired
     private LdapConnectionConfig conn;
     private LdapAttributeConfig attribute;
     private LdapAuthConfig auth;
+    private Directory directory;
     private LdapIdentityConfig identity;
 
     public boolean isEnabled() {
@@ -55,6 +72,14 @@ public class LdapConfig {
         this.enabled = enabled;
     }
 
+    public String getFilter() {
+        return filter;
+    }
+
+    public void setFilter(String filter) {
+        this.filter = filter;
+    }
+
     public LdapConnectionConfig getConn() {
         return conn;
     }
@@ -79,6 +104,14 @@ public class LdapConfig {
         this.auth = auth;
     }
 
+    public Directory getDirectory() {
+        return directory;
+    }
+
+    public void setDirectory(Directory directory) {
+        this.directory = directory;
+    }
+
     public LdapIdentityConfig getIdentity() {
         return identity;
     }
@@ -100,7 +133,7 @@ public class LdapConfig {
             throw new IllegalStateException("LDAP Host must be configured!");
         }
 
-        if (1 > conn.getPort() || 65535 < conn.getPort()) {
+        if (conn.getPort() < 1 || conn.getPort() > 65535) {
             throw new IllegalStateException("LDAP port is not valid");
         }
 
@@ -114,10 +147,29 @@ public class LdapConfig {
         }
 
         String uidType = attribute.getUid().getType();
-        if (!StringUtils.equals(LdapThreePidProvider.UID, uidType) && !StringUtils.equals(LdapThreePidProvider.MATRIX_ID, uidType)) {
+        if (!StringUtils.equals(LdapGenericBackend.UID, uidType) && !StringUtils.equals(LdapGenericBackend.MATRIX_ID, uidType)) {
             throw new IllegalArgumentException("Unsupported LDAP UID type: " + uidType);
         }
 
+        if (StringUtils.isBlank(identity.getToken())) {
+            throw new ConfigurationException("ldap.identity.token");
+        }
+
+        // Build queries
+        attribute.getThreepid().forEach((k, v) -> {
+            if (StringUtils.isBlank(identity.getMedium().get(k))) {
+                if (ThreePidMedium.PhoneNumber.is(k)) {
+                    identity.getMedium().put(k, LdapGenericBackend.buildOrQuery("+" + getIdentity().getToken()));
+                } else {
+                    identity.getMedium().put(k, LdapGenericBackend.buildOrQuery(getIdentity().getToken()));
+                }
+            }
+        });
+
+        getAuth().setFilter(StringUtils.defaultIfBlank(getAuth().getFilter(), getFilter()));
+        getDirectory().setFilter(StringUtils.defaultIfBlank(getDirectory().getFilter(), getFilter()));
+        getIdentity().setFilter(StringUtils.defaultIfBlank(getIdentity().getFilter(), getFilter()));
+
         log.info("Host: {}", conn.getHost());
         log.info("Port: {}", conn.getPort());
         log.info("Bind DN: {}", conn.getBindDn());
@@ -125,6 +177,7 @@ public class LdapConfig {
 
         log.info("Attribute: {}", gson.toJson(attribute));
         log.info("Auth: {}", gson.toJson(auth));
+        log.info("Directory: {}", gson.toJson(directory));
         log.info("Identity: {}", gson.toJson(identity));
     }