lib/server.js

@@ -47,15 +47,15 @@ function mergeFunctionArgs (argv, start, end) {
   const handlers = []
 
   for (let i = start; i < end; i++) {
-    if (argv[i] instanceof Array) {
+    if (Array.isArray(argv[i])) {
       const arr = argv[i]
       for (let j = 0; j < arr.length; j++) {
-        if (!(arr[j] instanceof Function)) {
+        if (typeof arr[j] !== 'function') {
           throw new TypeError('Invalid argument type: ' + typeof (arr[j]))
         }
         handlers.push(arr[j])
       }
-    } else if (argv[i] instanceof Function) {
+    } else if (typeof argv[i] === 'function') {
       handlers.push(argv[i])
     } else {
       throw new TypeError('Invalid argument type: ' + typeof (argv[i]))

package.json

@@ -3,7 +3,7 @@
   "name": "ldapjs",
   "homepage": "http://ldapjs.org",
   "description": "LDAP client and server APIs",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "@ldapjs/controls": "2.0.0",
     "@ldapjs/dn": "1.0.0",
     "@ldapjs/filter": "2.0.0",
-    "@ldapjs/messages": "1.0.1",
+    "@ldapjs/messages": "1.0.2",
     "@ldapjs/protocol": "^1.2.1",
     "abstract-logging": "^2.0.1",
     "assert-plus": "^1.0.0",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
-    "eslint": "8.35.0",
+    "eslint": "8.36.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-n": "^15.6.1",

test-integration/client/issue-860.test.js

@@ -0,0 +1,48 @@
+'use strict'
+
+const tap = require('tap')
+const ldapjs = require('../../lib')
+const parseDN = ldapjs.parseDN
+
+const SCHEME = process.env.SCHEME || 'ldap'
+const HOST = process.env.HOST || '127.0.0.1'
+const PORT = process.env.PORT || 389
+const baseURL = `${SCHEME}://${HOST}:${PORT}`
+
+const client = ldapjs.createClient({ url: baseURL })
+
+const opts = {
+  filter: '(&(objectClass=person))',
+  scope: 'sub',
+  paged: true,
+  sizeLimit: 100,
+  attributes: ['cn', 'employeeID']
+}
+
+const baseDN = parseDN('ou=テスト,dc=planetexpress,dc=com')
+
+tap.test('can search OUs with Japanese characters', t => {
+  client.bind('cn=admin,dc=planetexpress,dc=com', 'GoodNewsEveryone', (err) => {
+    t.error(err, 'bind error')
+  })
+
+  client.search(baseDN.toString(), opts, (err, res) => {
+    t.error(err, 'search error')
+    res.on('searchEntry', (entry) => {
+      t.match(entry.pojo, {
+        type: 'SearchResultEntry',
+        objectName: 'cn=jdoe,ou=\\e3\\83\\86\\e3\\82\\b9\\e3\\83\\88,dc=planetexpress,dc=com',
+        attributes: [{
+          type: 'cn',
+          values: ['John', 'jdoe']
+        }]
+      })
+    })
+    res.on('error', (err) => {
+      t.error(err, 'search entry error')
+    })
+    res.on('end', () => {
+      client.unbind(t.end)
+    })
+  })
+})

test-integration/client/issues.test.js

@@ -80,9 +80,9 @@ tap.test('can access large groups (issue #582)', t => {
 
         const memberAttr = results[0].attributes.find(a => a.type === 'member')
         t.ok(memberAttr)
-        t.ok(memberAttr.vals)
-        t.type(memberAttr.vals, Array)
-        t.equal(memberAttr.vals.length, 2000)
+        t.ok(memberAttr.values)
+        t.type(memberAttr.values, Array)
+        t.equal(memberAttr.values.length, 2000)
 
         client.unbind(t.end)
       })

test/server.test.js

@@ -3,6 +3,7 @@
 const net = require('net')
 const tap = require('tap')
 const vasync = require('vasync')
+const vm = require('node:vm')
 const { getSock } = require('./utils')
 const ldap = require('../lib')
 
@@ -434,3 +435,16 @@ tap.test('multithreading support via hook', function (t) {
     })
   })
 })
+
+tap.test('cross-realm type checks', function (t) {
+  const server = ldap.createServer()
+  const ctx = vm.createContext({})
+  vm.runInContext(
+    'globalThis.search=function(){};\n' +
+    'globalThis.searches=[function(){}];'
+    , ctx)
+  server.search('', ctx.search)
+  server.search('', ctx.searches)
+  t.ok(server)
+  t.end()
+})