Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit 41d1798

Browse files
authored
Merge branch 'master' into use-dependabot
2 parents 8b525af + fd216f4 commit 41d1798

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

lib/filters/filter.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
// var assert = require('assert')
44

5-
var asn1 = require('asn1')
6-
75
var Protocol = require('../protocol')
86

97
/// --- Globals
108

11-
var BerWriter = asn1.BerWriter
12-
139
var TYPES = {
1410
and: Protocol.FILTER_AND,
1511
or: Protocol.FILTER_OR,
@@ -38,9 +34,18 @@ function isFilter (filter) {
3834
return false
3935
}
4036

37+
function isBerWriter (ber) {
38+
return Boolean(
39+
ber &&
40+
typeof (ber) === 'object' &&
41+
typeof (ber.startSequence) === 'function' &&
42+
typeof (ber.endSequence) === 'function'
43+
)
44+
}
45+
4146
function mixin (target) {
4247
target.prototype.toBer = function toBer (ber) {
43-
if (!ber || !(ber instanceof BerWriter)) { throw new TypeError('ber (BerWriter) required') }
48+
if (isBerWriter(ber) === false) { throw new TypeError('ber (BerWriter) required') }
4449

4550
ber.startSequence(TYPES[this.type])
4651
ber = this._toBer(ber)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "ldapjs",
44
"homepage": "http://ldapjs.org",
55
"description": "LDAP client and server APIs",
6-
"version": "2.0.0",
6+
"version": "2.1.0",
77
"license": "MIT",
88
"repository": {
99
"type": "git",

0 commit comments

Comments
 (0)