* fixing bug where no user results would cause unpredictable behavior

bhoriuchi · Aug 18, 2016 · 8962a18 · 8962a18
1 parent 5b4d563
commit 8962a18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -139,9 +139,10 @@ Strategy.prototype.authenticate = function (req) {
 
     return this._ad.find({ filter: filter, attributes: attributes }, function (err, results) {
       if (err) return _this.error(err);
-      var users = results.users;
-      if (!Array.isArray(users) || !users.length) return _this.fail('The user "' + username + '" was not found');
-      var userProfile = _this.mapProfile(users[0]);
+      if (!results || !results.users || !Array.isArray(results.users) || !results.users.length) {
+        return _this.fail('The user "' + username + '" was not found');
+      }
+      var userProfile = _this.mapProfile(results.users[0]);
       return _this._integrated ? verify(userProfile) : auth(userProfile);
     });
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "passport-activedirectory",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Active Directory strategy for passport.js",
   "license": "MIT",
   "main": "index.js",

diff --git a/src/strategy.js b/src/strategy.js
@@ -138,9 +138,10 @@ Strategy.prototype.authenticate = function (req, options = {}) {
 
     return this._ad.find({ filter, attributes }, (err, results) => {
       if (err) return this.error(err)
-      let users = results.users
-      if (!Array.isArray(users) || !users.length) return this.fail(`The user "${username}" was not found`)
-      let userProfile = this.mapProfile(users[0])
+      if (!results || !results.users || !Array.isArray(results.users) || !results.users.length) {
+        return this.fail(`The user "${username}" was not found`)
+      }
+      let userProfile = this.mapProfile(results.users[0])
       return this._integrated ? verify(userProfile) : auth(userProfile)
     })
   }