ldap-authentication 3.2.4 → 3.2.6

package/index.js

@@ -1,5 +1,42 @@
 const assert = require('assert')
 const ldap = require('ldapjs')
+// escape the , in CN in DN
+function _ldapEscapeDN(s) {
+  let ret = "";
+  let comaPositions = [];
+  let done = false;
+  let countEq = 0;
+  for (let i = 0; !done && i < s.length; i++) {
+    switch (s[i]) {
+      case "\\":
+        // user already escapped, continue
+        i++;
+        break;
+      case ",":
+        if (countEq == 1) {
+          comaPositions.push(i);
+        }
+        break;
+      case "=":
+        countEq++;
+        if (countEq == 2) {
+          done = true;
+        }
+        break;
+    }
+  }
+  if (done) {
+    comaPositions.pop();
+  }
+  let lastIndex = 0;
+  for (let i of comaPositions) {
+    ret += s.substring(lastIndex, i);
+    ret += "\\,";
+    lastIndex = i + 1;
+  }
+  ret += s.substring(lastIndex);
+  return ret;
+}
 
 // convert an escaped utf8 string returned from ldapjs
 function _isHex(c) {
@@ -55,6 +92,7 @@ function _searchResultToUser(pojo) {
 }
 // bind and return the ldap client
 function _ldapBind(dn, password, starttls, ldapOpts) {
+  dn = _ldapEscapeDN(dn)
   return new Promise(function (resolve, reject) {
     ldapOpts.connectTimeout = ldapOpts.connectTimeout || 5000
     let client = ldap.createClient(ldapOpts)
@@ -468,4 +506,5 @@ module.exports.exportForTesting = {
   _isHex,
   _parseEscapedHexToUtf8,
   _recursiveParseHexString,
+  _ldapEscapeDN
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldap-authentication",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "A simple async nodejs library for LDAP user authentication",
   "main": "index.js",
   "types": "./index.d.ts",

package/test/string.spec.js

@@ -1,5 +1,5 @@
 const { exportForTesting } = require('../index.js')
-const { _isHex, _parseEscapedHexToUtf8, _recursiveParseHexString } =
+const { _isHex, _parseEscapedHexToUtf8, _recursiveParseHexString, _ldapEscapeDN } =
   exportForTesting
 
 describe('string conversion test', () => {
@@ -41,3 +41,22 @@ describe('string conversion test', () => {
     expect(converted).toEqual(target)
   })
 })
+
+describe('escape , in the DN test', ()=>{
+  let cases = [
+    { s: "a", want: "a" },
+    { s: "", want: "" },
+    { s: "CN=a,DN=b", want: "CN=a,DN=b" },
+    { s: "CN=a, c,DN=b", want: "CN=a\\, c,DN=b" },
+    { s: "CN=a\\, c,DN=b", want: "CN=a\\, c,DN=b" },
+    { s: "CN=a, b, c,DN=b", want: "CN=a\\, b\\, c,DN=b" },
+    { s: "CN=a, c", want: "CN=a\\, c" },
+  ]
+  for (let c of cases) {
+    it("escape "+c.s, ()=>{
+      let got = _ldapEscapeDN(c.s)
+      expect(got).toEqual(c.want)
+    })
+    
+  }
+})