handle synchronous error in ldap search

cheminfo · Sep 8, 2017 · 015f414 · 015f414
1 parent ff70cce
commit 015f414
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/src/couch/group.js b/src/couch/group.js
@@ -206,7 +206,6 @@ async function syncOneLdapGroup(ctx, group) {
     const couchOptions = ctx._couchOptions;
     const entries = await ldapSearch({
         url: couchOptions.ldapUrl,
-        connectionTimeout: 2000,
         bindDN: couchOptions.ldapBindDN,
         bindPassword: couchOptions.ldapBindPassword
     }, {

diff --git a/src/server/middleware/couch.js b/src/server/middleware/couch.js
@@ -359,7 +359,7 @@ function onGetError(ctx, e, secure) {
             break;
     }
     if (e.message && e.message !== ctx.body) {
-        ctx.body += `: ${e.message}`;
+        ctx.body += `: ${e}`;
     }
     if (config.debugrest) {
         ctx.body += `\n\n${e}\n${e.stack}`;

diff --git a/src/util/LDAP.js b/src/util/LDAP.js
@@ -3,7 +3,19 @@
 const ldapjs = require('ldapjs');
 const debug = require('./debug')('ldap:client');
 
+const defaultSearchOptions = {
+    scope: 'sub',
+    timeLimit: 1
+};
+
+const defaultLdapOptions = {
+    connectTimeout: 2000,
+    timeout: 2000
+};
+
 function search(ldapOptions, searchOptions) {
+    searchOptions = Object.assign({}, defaultSearchOptions, searchOptions);
+    ldapOptions = Object.assign({}, defaultLdapOptions, ldapOptions);
     return new Promise((resolve, reject) => {
         // ldap options should include bind options
         // if client could know when it is ready
@@ -12,6 +24,7 @@ function search(ldapOptions, searchOptions) {
         client.on('error',  function(e) {
             reject(e);
         });
+
         client.__resolve__ = function(value) {
             client.destroy();
             resolve(value);
@@ -22,22 +35,28 @@ function search(ldapOptions, searchOptions) {
             reject(err);
         };
         return bind(client, ldapOptions.bindDN, ldapOptions.bindPassword).then(() => {
-            client.search(searchOptions.base, searchOptions, (err, res) => {
-                if (err) {
-                    client.__reject__(err);
-                    return;
-                }
-                const entries = [];
-                res.on('searchEntry', function (entry) {
-                    entries.push(entry);
-                });
-                res.on('error', function (err) {
-                    client.__reject__(err);
+            try {
+                client.search(searchOptions.DN, searchOptions, (err, res) => {
+                    if (err) {
+                        client.__reject__(err);
+                        return;
+                    }
+                    const entries = [];
+                    res.on('searchEntry', function (entry) {
+                        entries.push(entry);
+                    });
+                    res.on('error', function (err) {
+                        client.__reject__(err);
+                    });
+                    res.on('end', function () {
+                        client.__resolve__(entries);
+                    });
                 });
-                res.on('end', function () {
-                    client.__resolve__(entries);
-                });
-            });
+            } catch(e) {
+                // LIBRARY!!! WHY DON'T YOU PASS ALL YOUR ERRORS IN THE CALLBACK!!!
+                client.__reject__(e);
+            }
+
         }).catch(e => {/* Error should be handled by __reject__ */});
     });
 }

diff --git a/test/homedir/test-ldap/config.js b/test/homedir/test-ldap/config.js
@@ -4,4 +4,5 @@ console.log('load configuration');
 
 module.exports = {
     ldapSync: false,
+    ldapUrl: 'ldap://localhost'
 };