Merge pull request #19 from ilves/jsumners

Handle connection timeout event

lib/activedirectory.js

@@ -913,6 +913,10 @@ ActiveDirectory.prototype.authenticate = function authenticate (username, passwo
   }
 
   const client = utils.createClient(null, null, this)
+  client.on('connectTimeout', (err) => {
+    this.emit('error', err)
+    return callback(err, false)
+  })
   client.on('error', (err) => {
     // only used on socket connection failure since it doesn't invoke bind cb
     this.emit('error', err)

lib/components/search.js

@@ -58,6 +58,10 @@ function Searcher (opts) {
   this.rangeProcessing = false
 
   this.client = utils.createClient(ad.url || ad.opts.url, this.ldapOpts, ad)
+  this.client.on('connectTimeout', (err) => {
+    // to handle connection errors
+    this.callback(err)
+  })
   this.client.on('error', (err) => {
     // to handle connection errors
     this.callback(err)

test/find.js

@@ -3,6 +3,7 @@
 /* eslint-disable no-unused-expressions */
 
 const expect = require('chai').expect
+const ldapjs = require('ldapjs')
 const ActiveDirectory = require('../index')
 const config = require('./config')
 
@@ -215,5 +216,16 @@ describe('find Method', function () {
         done()
       })
     })
+
+    it('should return err (ConnectionError) when connection timeouts', function (done) {
+      new ActiveDirectory({
+        url: 'ldap://example.com',
+        connectTimeout: 100
+      }).find({}, function (err, result) {
+        expect(err).to.be.an.instanceOf(ldapjs.ConnectionError)
+        expect(result).to.be.undefined
+        done()
+      })
+    })
   })
 })

test/network.js

@@ -3,6 +3,7 @@
 /* eslint-disable no-unused-expressions */
 
 const expect = require('chai').expect
+const ldapjs = require('ldapjs')
 const ActiveDirectory = require('../index')
 
 describe('Network Connections', function () {
@@ -33,5 +34,17 @@ describe('Network Connections', function () {
         done()
       })
     })
+
+    it('should return err (ConnectionError) when connection timeouts', function (done) {
+      const ad = new ActiveDirectory({
+        url: 'ldap://example.com',
+        connectTimeout: 1
+      })
+      ad.authenticate(username, password, function (err, auth) {
+        expect(err).to.be.an.instanceOf(ldapjs.ConnectionError)
+        expect(auth).to.be.false
+        done()
+      })
+    })
   })
 })