From 5fad6a25a87af14599e611415036efc698a48af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bennet=20Ble=C3=9Fmann?= Date: Mon, 20 Apr 2020 10:54:12 +0200 Subject: [PATCH] Pass through ldap starttls option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixing Issue #329 (cherry picked from commit b9169eb279020f21b372a843a83c71929fb6fd1d) Signed-off-by: Bennet Bleßmann --- lib/config/default.js | 3 ++- lib/web/auth/ldap/index.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/config/default.js b/lib/config/default.js index 46c89a4f3..fe699a6d5 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -133,7 +133,8 @@ module.exports = { searchAttributes: undefined, usernameField: undefined, useridField: undefined, - tlsca: undefined + tlsca: undefined, + starttls: undefined }, saml: { idpSsoUrl: undefined, diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js index b501106dc..78d82dbf0 100644 --- a/lib/web/auth/ldap/index.js +++ b/lib/web/auth/ldap/index.js @@ -19,7 +19,8 @@ passport.use(new LDAPStrategy({ searchBase: config.ldap.searchBase || null, searchFilter: config.ldap.searchFilter || null, searchAttributes: config.ldap.searchAttributes || null, - tlsOptions: config.ldap.tlsOptions || null + tlsOptions: config.ldap.tlsOptions || null, + starttls: config.ldap.starttls || null } }, function (user, done) { var uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined