Merge pull request #11 from mcriss/master

Allow binding as user
ContainX · Mar 10, 2017 · 2f599cb · 2f599cb
2 parents d65b77c + a10d997
commit 2f599cb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/io/containx/marathon/plugin/auth/util/LDAPHelper.java b/src/main/java/io/containx/marathon/plugin/auth/util/LDAPHelper.java
@@ -40,8 +40,8 @@ public static Set<String> validate(String username, String userPassword, LDAPCon
             String bindPassword = userPassword;
 
             if(bindUser != null) {
-                dn = bindUser;
-                bindPassword = config.getBindPassword();
+                bindUser = bindUser.replace("{username}", username);
+                bindPassword = (config.getBindPassword() == null) ? userPassword : config.getBindPassword();
             } else {
                 if (config.useSimpleAuthentication()) {
                     dn = config.getDn().replace("{username}", username);