ldap-verifyuser - npm Package Compare versions

Comparing version 1.0.2 to 1.1.0

lib/verifyUser.js

@@ -5,3 +5,3 @@ #!/usr/bin/env node
  *
- * Copyright (C) 2015 Hendrik 'Xendo' Meyer
+ * Copyright (C) 2015-2016 Hendrik 'T4cC0re' Meyer
  *
@@ -14,45 +14,79 @@ * This software may be modified and distributed under the terms
 
-  verifyUser: function (config, username, password, callback){
+  verifyUser: function (config, username, password, callback) {
 
-	  var client = require("ldapjs-hotfix").createClient({url: config.server, tlsOptions: config.tlsOptions || {}});
+    config = config || {};
 
-	  client.bind(config.adrdn + username, password, function(err) {
-	    if(!err){
-	      if(config.debug){console.log("bound with user's credentials");}
-	      var opts = {
-		      filter: '(&(sAMAccountName=' + username + '))',
-		      scope: 'sub'
-	      }
-	      client.search(config.adquery, opts, function(err, res){
-		      var data = {
-		        raw: null,
-		        valid: false,
-		        locked: true
-		      }
-		      res.on('searchEntry', function(entry) {
-		        data.raw = entry.object;
-		        data.valid = true;
-		        if (Number(entry.object.lockoutTime) == 0){
-		          if(config.debug){console.log("account not locked and valid!");}
-		          data.locked = false;
-		        }
-		      });
-		      res.on('error', function(err) {
-		        if(config.debug){console.error(error, err.message);}
-		        callback(err, {status: 1});
-		      });
-		      res.on('end', function(result) {
-		        if(config.debug){console.log('status: ' + result.status);}
-		        callback(null, data);
-		      });
-		      if(err){
-		        callback(err, {status: 1});
-		      }
-	      });
-	    } else {
-	      if(config.debug){console.error(error, err.message);}
-	      callback(err, {status: 1});
-	    }
-	  });
+    var client = require("ldapjs-hotfix")
+      .createClient(
+        {
+          url       : config.server,
+          tlsOptions: config.tlsOptions || {}
+        }
+      );
+
+    var bindAdrdn = config.adrdn + username;
+
+    if (config.rawAdrdn) {
+      bindAdrdn = config.adrdn;
+    }
+
+    client.bind(
+      bindAdrdn, password, function (err) {
+        if (!err) {
+          if (config.debug) {
+            console.log(
+              "bound with " + config.rawAdrdn
+                ? "with raw adrdn"
+                : "user credentials"
+            );
+          }
+          var opts = {
+            filter: '(&(sAMAccountName=' + username + '))',
+            scope : 'sub'
+          };
+          client.search(
+            config.adquery, opts, function (err, res) {
+              var data = {
+                raw   : null,
+                valid : false,
+                locked: true
+              };
+              res.on(
+                'searchEntry', function (entry) {
+                  data.raw   = entry.object;
+                  data.valid = true;
+                  if (Number(entry.object.lockoutTime) == 0) {
+                    if (config.debug) {
+                      console.log(
+                        "account not locked and valid!"
+                      );
+                    }
+                    data.locked = false;
+                  }
+                }
+              );
+              res.on(
+                'error', function (err) {
+                  if (config.debug) {console.error("error", err.message);}
+                  callback(err, {status: 1});
+                }
+              );
+              res.on(
+                'end', function (result) {
+                  if (config.debug) {console.log('status: ' + result.status);}
+                  callback(null, data);
+                }
+              );
+              if (err) {
+                callback(err, {status: 1});
+              }
+            }
+          );
+        } else {
+          if (config.debug) {console.error("error", err.message);}
+          callback(err, {status: 1});
+        }
+      }
+    );
   }
-}
+};

package.json

 {
   "name": "ldap-verifyuser",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "ldap-verifyuser is a node.js library based on ldapjs, that authenticates a user against a LDAP or AD without requiring an configured administrator account.",
-  "author": "Hendrik 'Xendo' Meyer <[e-mail]>",
+  "author": "Hendrik 'T4cC0re' Meyer <[e-mail]>",
   "contributors": [{
-  "name": "Hendrik 'Xendo' Meyer",
-  "email": "[e-mail]"
+  "name": "Hendrik 'T4cC0re' Meyer",
+  "email": "[e-mail]"
 }],
@@ -13,6 +13,6 @@ "main": "lib/verifyUser.js",
   "type": "git",
-  "url": "https://github.com/butterkekstorte/ldap-verifyuser"
+  "url": "https://github.com/T4cC0re/ldap-verifyuser"
 },
   "bugs": {
-  "url": "https://github.com/butterkekstorte/ldap-verifyuser/issues"
+  "url": "https://github.com/T4cC0re/ldap-verifyuser/issues"
 },
@@ -19,0 +19,0 @@ "keywords": [

README.md

@@ -17,3 +17,4 @@ # ldap-verifyuser
   adquery: 'dc=MYCORP,dc=LOCAL',
-  debug: false
+  debug: false,
+  rawAdrdn: false
 },
@@ -35,2 +36,4 @@ username = 'myacc',
 
+Set `config.rawAdrdn` to `true` to use the supplied `adrdn` without modifications/appending the username.
+
 ## Installation
@@ -37,0 +40,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

32265

increased by25.63%

Number of package files

16

increased by23.08%

Lines of code

82

increased by60.78%

Number of lines in readme file

53

increased by6%

No dependency changes