Make listen port and ldap filter more flexible

diff --git a/server.js b/server.js
index c17fcb8c180e8ef6b04d8cafad3b6b8cb577199b..e79dad29e444f652477bba8fe20af6e94afac793 100755 (executable)
--- a/server.js
+++ b/server.js
@@ -161,7 +161,7 @@ app.use('/', function (req, res) {
 });
 app.use(lastMile());
 
-var server = app.listen(3000, function () {
+var server = app.listen(process.env.LISTEN, function () {
     var host = server.address().address;
     var port = server.address().port;
 

diff --git a/src/auth.js b/src/auth.js
index 5f4c7776601ceb0cbcd4117212c22c3ee8160382..d575d601d1c91c0a84ed3202e37cb30b87c6c66c 100644 (file)
--- a/src/auth.js
+++ b/src/auth.js
@@ -71,8 +71,8 @@ function verifyUser(username, password, callback) {
         ldapClient.bind(process.env.CLOUDRON_LDAP_BIND_DN, process.env.CLOUDRON_LDAP_BIND_PASSWORD, function (error) {
             if (error) return callback(error);
 
-            var filter = `(|(uid=${username})(mail=${username})(username=${username})(sAMAccountName=${username}))`;
-            ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
+            var filter = process.env.CLOUDRON_LDAP_FILTER.replace(/\{username\}/g, username);
+            ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter, scope: "sub" }, function (error, result) {
                 if (error) return callback(error);
 
                 var items = [];