public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #669 from GuillaumeRemyCSI/secure-ldap

Browse source 
Added secure config parameter to use ldaps protocol
This commit is contained in:
Tomas Bures 2019-08-14 11:24:15 +02:00 committed by GitHub
commit 54f7225077
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/lib/passport.js
View file

@ -20,7 +20,8 @@ let authMode = 'local';
let LdapStrategy;
let ldapStrategyOpts;
if (config.ldap.enabled) {
if (!config.ldap.method || config.ldap.method == 'ldapjs') {
const ldapProtocol = config.ldap.secure ? 'ldaps' : 'ldap';
if (!config.ldap.method || config.ldap.method === 'ldapjs') {
try {
LdapStrategy = require('passport-ldapjs').Strategy; // eslint-disable-line global-require
authMode = 'ldapjs';
@ -28,7 +29,7 @@ if (config.ldap.enabled) {
ldapStrategyOpts = {
server: {
url: 'ldap://' + config.ldap.host + ':' + config.ldap.port
url: ldapProtocol + '://' + config.ldap.host + ':' + config.ldap.port
},
base: config.ldap.baseDN,
search: {
@ -46,7 +47,7 @@ if (config.ldap.enabled) {
}
}
if (!LdapStrategy && (!config.ldap.method || config.ldap.method == 'ldapauth')) {
if (!LdapStrategy && (!config.ldap.method || config.ldap.method === 'ldapauth')) {
try {
LdapStrategy = require('passport-ldapauth').Strategy; // eslint-disable-line global-require
authMode = 'ldapauth';
@ -54,7 +55,7 @@ if (config.ldap.enabled) {
ldapStrategyOpts = {
server: {
url: 'ldap://' + config.ldap.host + ':' + config.ldap.port,
url: ldapProtocol + '://' + config.ldap.host + ':' + config.ldap.port,
searchBase: config.ldap.baseDN,
searchFilter: config.ldap.filter,
searchAttributes: [config.ldap.uidTag, config.ldap.nameTag, 'mail'],