supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2021 from thelounge/xpaw/ldapjs-no-dtrace

Browse Source 
Use forked ldapjs to remove dtrace
This commit is contained in:
Pavel Djundik 2018-02-13 11:58:25 +02:00 committed by GitHub
commit 4639a2528d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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.1",
"web-push": "3.2.5"

6
src/plugins/auth/ldap.js
View File

@ -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;

2
test/plugins/auth/ldap.js
View File

@ -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";