From c4f6701d6573908fc3c33e3e0e2aecc35116b92f Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Tue, 30 Jan 2018 21:57:44 +0200 Subject: [PATCH] Use forked ldapjs to remove dtrace Fixes #1756 --- package.json | 2 +- src/plugins/auth/ldap.js | 6 +++++- test/plugins/auth/ldap.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 44c488cd..da96acc6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "express": "4.16.2", "fs-extra": "5.0.0", "irc-framework": "2.10.3", - "ldapjs": "1.0.2", "lodash": "4.17.5", "mime-types": "2.1.17", "moment": "2.20.1", @@ -56,6 +55,7 @@ "semver": "5.5.0", "socket.io": "2.0.4", "spdy": "3.4.7", + "thelounge-ldapjs-non-maintained-fork": "1.0.2", "ua-parser-js": "0.7.17", "urijs": "1.19.0", "web-push": "3.2.5" diff --git a/src/plugins/auth/ldap.js b/src/plugins/auth/ldap.js index 8f3239fd..450eb937 100644 --- a/src/plugins/auth/ldap.js +++ b/src/plugins/auth/ldap.js @@ -1,7 +1,11 @@ "use strict"; const Helper = require("../../helper"); -const ldap = require("ldapjs"); + +// Forked ldapjs for 2 reasons: +// 1. Removed bunyan https://github.com/joyent/node-ldapjs/pull/399 +// 2. Remove dtrace-provider dependency +const ldap = require("thelounge-ldapjs-non-maintained-fork"); function ldapAuthCommon(user, bindDN, password, callback) { const config = Helper.config; diff --git a/test/plugins/auth/ldap.js b/test/plugins/auth/ldap.js index 7b9213eb..77930a92 100644 --- a/test/plugins/auth/ldap.js +++ b/test/plugins/auth/ldap.js @@ -2,7 +2,7 @@ const ldapAuth = require("../../../src/plugins/auth/ldap"); const Helper = require("../../../src/helper"); -const ldap = require("ldapjs"); +const ldap = require("thelounge-ldapjs-non-maintained-fork"); const expect = require("chai").expect; const user = "johndoe";