From 09b128b79e896d86a84f6eb5e8ffbf5efda6086d Mon Sep 17 00:00:00 2001 From: James Sumners Date: Thu, 16 Jul 2020 19:24:50 -0400 Subject: [PATCH 01/15] Update main CI Trying to resolve https://github.com/coverallsapp/github-action/issues/26 Also a couple other updates. --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9468cb..e9cae6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: name: Lint Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions/setup-node@v1 - name: Install Packages run: npm install @@ -29,9 +29,10 @@ jobs: - 10.13.0 - 10.x - 12.x + - 14.x runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} @@ -40,12 +41,12 @@ jobs: - name: Run Tests run: npm run test:ci - name: Coveralls Parallel - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v1.1.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true - name: Coveralls Finished - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v1.1.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true From 3c5138de26e54d9c7dbcc16515b6df044668dfdb Mon Sep 17 00:00:00 2001 From: Robert Kawecki Date: Thu, 16 Jul 2020 14:32:04 +0200 Subject: [PATCH 02/15] Remove instanceof check in filter#toBer mixin For #629 --- lib/filters/filter.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/filters/filter.js b/lib/filters/filter.js index 4c7e4ba..612b7fd 100644 --- a/lib/filters/filter.js +++ b/lib/filters/filter.js @@ -2,14 +2,10 @@ // var assert = require('assert') -var asn1 = require('asn1') - var Protocol = require('../protocol') /// --- Globals -var BerWriter = asn1.BerWriter - var TYPES = { and: Protocol.FILTER_AND, or: Protocol.FILTER_OR, @@ -40,7 +36,7 @@ function isFilter (filter) { function mixin (target) { target.prototype.toBer = function toBer (ber) { - if (!ber || !(ber instanceof BerWriter)) { throw new TypeError('ber (BerWriter) required') } + if (!ber) { throw new TypeError('ber (BerWriter) required') } ber.startSequence(TYPES[this.type]) ber = this._toBer(ber) From b0b5e935c7f7d11fe84586a28ae61119e01b0ce4 Mon Sep 17 00:00:00 2001 From: Robert Kawecki Date: Thu, 16 Jul 2020 16:10:54 +0200 Subject: [PATCH 03/15] Add duck-type check for BerWriter in filter#toBer mixin For #629 --- lib/filters/filter.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/filters/filter.js b/lib/filters/filter.js index 612b7fd..f2e311b 100644 --- a/lib/filters/filter.js +++ b/lib/filters/filter.js @@ -34,9 +34,17 @@ function isFilter (filter) { return false } +function isBerWriter (ber) { + return ( + typeof (ber) === 'object' && + typeof (ber.startSequence) === 'function' && + typeof (ber.endSequence) === 'function' + ) +} + function mixin (target) { target.prototype.toBer = function toBer (ber) { - if (!ber) { throw new TypeError('ber (BerWriter) required') } + if (!ber || !isBerWriter(ber)) { throw new TypeError('ber (BerWriter) required') } ber.startSequence(TYPES[this.type]) ber = this._toBer(ber) From 4318b28198bbd365a72fcf7b3b066ede164f926c Mon Sep 17 00:00:00 2001 From: Robert Kawecki Date: Tue, 21 Jul 2020 13:34:59 +0200 Subject: [PATCH 04/15] Integrate falsy check into isBerWriter to avoid long inline conditions For #629 --- lib/filters/filter.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/filters/filter.js b/lib/filters/filter.js index f2e311b..fc4d061 100644 --- a/lib/filters/filter.js +++ b/lib/filters/filter.js @@ -35,7 +35,8 @@ function isFilter (filter) { } function isBerWriter (ber) { - return ( + return Boolean( + ber && typeof (ber) === 'object' && typeof (ber.startSequence) === 'function' && typeof (ber.endSequence) === 'function' @@ -44,7 +45,7 @@ function isBerWriter (ber) { function mixin (target) { target.prototype.toBer = function toBer (ber) { - if (!ber || !isBerWriter(ber)) { throw new TypeError('ber (BerWriter) required') } + if (!isBerWriter(ber)) { throw new TypeError('ber (BerWriter) required') } ber.startSequence(TYPES[this.type]) ber = this._toBer(ber) From 1a09e62eda19b73d4587c16c9b82d19d4631cd3c Mon Sep 17 00:00:00 2001 From: Robert Kawecki Date: Tue, 21 Jul 2020 13:51:49 +0200 Subject: [PATCH 05/15] Make false check explicit in isBerWriter comparison Co-authored-by: James Sumners --- lib/filters/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filters/filter.js b/lib/filters/filter.js index fc4d061..3874a45 100644 --- a/lib/filters/filter.js +++ b/lib/filters/filter.js @@ -45,7 +45,7 @@ function isBerWriter (ber) { function mixin (target) { target.prototype.toBer = function toBer (ber) { - if (!isBerWriter(ber)) { throw new TypeError('ber (BerWriter) required') } + if (isBerWriter(ber) === false) { throw new TypeError('ber (BerWriter) required') } ber.startSequence(TYPES[this.type]) ber = this._toBer(ber) From afd444466f36e56154140fd4045d5e2113587d2c Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Tue, 21 Jul 2020 15:38:23 -0500 Subject: [PATCH 06/15] add dependabot.yml --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..6ebae6b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "daily" From 8b525af520d85fff1a37161aca44040a5b21ae83 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Tue, 21 Jul 2020 16:53:00 -0500 Subject: [PATCH 07/15] run dependabot weekly Co-authored-by: James Sumners --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6ebae6b..3deee26 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,8 +3,8 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "npm" directory: "/" schedule: - interval: "daily" + interval: "weekly" From b8100b114c5a4040e6ec06b2aa1f100b00c953d3 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Tue, 21 Jul 2020 17:54:12 -0400 Subject: [PATCH 08/15] v2.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 468dc27..989198f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "ldapjs", "homepage": "http://ldapjs.org", "description": "LDAP client and server APIs", - "version": "2.0.0", + "version": "2.1.0", "license": "MIT", "repository": { "type": "git", From 3b33c00197330014e628573b27c64c7a666e006d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 23:03:09 +0000 Subject: [PATCH 09/15] Bump abstract-logging from 1.0.0 to 2.0.0 Bumps [abstract-logging](https://github.com/jsumners/abstract-logging) from 1.0.0 to 2.0.0. - [Release notes](https://github.com/jsumners/abstract-logging/releases) - [Commits](https://github.com/jsumners/abstract-logging/commits/v2.0.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 989198f..b708d8a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "node": ">=10.13.0" }, "dependencies": { - "abstract-logging": "^1.0.0", + "abstract-logging": "^2.0.0", "asn1": "^0.2.4", "assert-plus": "^1.0.0", "backoff": "^2.5.0", From d2c5464bc212127abff6cbec34906eb1c71a129c Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Tue, 21 Jul 2020 20:28:15 -0500 Subject: [PATCH 10/15] no need to create instance --- lib/logger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/logger.js b/lib/logger.js index ad96ba4..1622872 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,6 +1,6 @@ 'use strict' -const logger = Object.create(require('abstract-logging')) +const logger = require('abstract-logging') logger.child = function () { return logger } module.exports = logger From 2f2fa350ef95543fab294a2e3e81223ddea8b962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2020 10:07:06 +0000 Subject: [PATCH 11/15] Bump husky from 3.1.0 to 4.2.5 Bumps [husky](https://github.com/typicode/husky) from 3.1.0 to 4.2.5. - [Release notes](https://github.com/typicode/husky/releases) - [Changelog](https://github.com/typicode/husky/blob/master/CHANGELOG.md) - [Commits](https://github.com/typicode/husky/compare/v3.1.0...v4.2.5) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b708d8a..eefe056 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "get-port": "^5.1.1", - "husky": "^3.0.4", + "husky": "^4.2.5", "snazzy": "^8.0.0", "standard": "^14.0.2", "tap": "14.10.1", From 1c82d82b37e2ef863623ae3c458485538d0952d3 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Wed, 22 Jul 2020 07:58:47 -0400 Subject: [PATCH 12/15] Update dependabot.yml + Check for updates on a day when there is likely more time for them to be dealt with + Only apply version changes if they are not already covered by the configured qualifiers --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3deee26..21bfa1e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,10 +1,18 @@ version: 2 updates: - package-ecosystem: "github-actions" + versioning-strategy: increase-if-necessary directory: "/" schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" - package-ecosystem: "npm" + versioning-strategy: increase-if-necessary directory: "/" schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" From acc1e4ca8dbb1b322360c6a8d2381073bda30538 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Wed, 22 Jul 2020 10:11:48 -0500 Subject: [PATCH 13/15] remove uuid --- package.json | 3 +-- test/client.test.js | 3 +-- test/laundry.test.js | 3 +-- test/utils.js | 9 +++++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index eefe056..f58ad87 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,7 @@ "husky": "^4.2.5", "snazzy": "^8.0.0", "standard": "^14.0.2", - "tap": "14.10.1", - "uuid": "^3.3.3" + "tap": "14.10.1" }, "scripts": { "test": "tap --no-cov", diff --git a/test/client.test.js b/test/client.test.js index eed6c39..fca862f 100644 --- a/test/client.test.js +++ b/test/client.test.js @@ -3,10 +3,9 @@ const util = require('util') const assert = require('assert') const tap = require('tap') -const uuid = require('uuid') const vasync = require('vasync') const getPort = require('get-port') -const { getSock } = require('./utils') +const { getSock, uuid } = require('./utils') const ldap = require('../lib') const { Attribute, Change } = ldap diff --git a/test/laundry.test.js b/test/laundry.test.js index 796e48c..1c03b6e 100644 --- a/test/laundry.test.js +++ b/test/laundry.test.js @@ -1,8 +1,7 @@ 'use strict' const tap = require('tap') -const uuid = require('uuid') -const { getSock } = require('./utils') +const { getSock, uuid } = require('./utils') const ldap = require('../lib') function search (t, options, callback) { diff --git a/test/utils.js b/test/utils.js index 6d5598b..aea3ea4 100644 --- a/test/utils.js +++ b/test/utils.js @@ -2,7 +2,11 @@ const os = require('os') const path = require('path') -const uuid = require('uuid') +const crypto = require('crypto') + +function uuid () { + return crypto.randomBytes(16).toString('hex') +} function getSock () { if (process.platform === 'win32') { @@ -13,5 +17,6 @@ function getSock () { } module.exports = { - getSock + getSock, + uuid } From 6ee5db077cf85613099a6ff00711780fdfc28b64 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Wed, 22 Jul 2020 12:41:03 -0400 Subject: [PATCH 14/15] Update dependabot.yml Seems the versioning strategy isn't supported for actions? --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 21bfa1e..9a4ac3c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: "github-actions" - versioning-strategy: increase-if-necessary + # versioning-strategy: increase-if-necessary directory: "/" schedule: interval: "weekly" From ac30b3590308634abc8883a072e96d24d5f1a704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2020 16:41:31 +0000 Subject: [PATCH 15/15] Bump tap from 14.10.1 to 14.10.8 Bumps [tap](https://github.com/tapjs/node-tap) from 14.10.1 to 14.10.8. - [Release notes](https://github.com/tapjs/node-tap/releases) - [Commits](https://github.com/tapjs/node-tap/compare/v14.10.1...v14.10.8) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f58ad87..bbe83eb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "husky": "^4.2.5", "snazzy": "^8.0.0", "standard": "^14.0.2", - "tap": "14.10.1" + "tap": "14.10.8" }, "scripts": { "test": "tap --no-cov",