Merge pull request #349 from zermelo-software/passport-ldapauth
Add support for passport-ldapauth
This commit is contained in:
commit
69550d0383
2 changed files with 68 additions and 3 deletions
|
@ -125,6 +125,22 @@ passwordresetlink=""
|
||||||
bindUser=""
|
bindUser=""
|
||||||
bindPassword=""
|
bindPassword=""
|
||||||
|
|
||||||
|
[ldapauth]
|
||||||
|
# Alternative LDAP implementation using the more popular passport-ldapauth library.
|
||||||
|
enabled=false
|
||||||
|
host="localhost"
|
||||||
|
port=389
|
||||||
|
# Subtree in which the searchrequest for the user is done
|
||||||
|
baseDN="ou=users,dc=company"
|
||||||
|
# What whe are searching for. This should return a single user.
|
||||||
|
filter="(|(sAMAccountName={{username}})(mail={{username}}))"
|
||||||
|
# Username field in LDAP, used to identify the user in Mailtrain (uid/cn/username/sAMAccountName)
|
||||||
|
uidTag="sAMAccountName"
|
||||||
|
passwordresetlink=""
|
||||||
|
# Credentials for the initial search operation (final bind DN will be exactly as specified)
|
||||||
|
bindUser="name@company.net"
|
||||||
|
bindPassword="mySecretPassword"
|
||||||
|
|
||||||
[postfixbounce]
|
[postfixbounce]
|
||||||
# Enable to allow writing Postfix bounce log to Mailtrain listener
|
# Enable to allow writing Postfix bounce log to Mailtrain listener
|
||||||
# If enabled, tail mail.log to Mailtrain with the following command:
|
# If enabled, tail mail.log to Mailtrain with the following command:
|
||||||
|
|
|
@ -17,7 +17,16 @@ try {
|
||||||
LdapStrategy = require('passport-ldapjs').Strategy; // eslint-disable-line global-require
|
LdapStrategy = require('passport-ldapjs').Strategy; // eslint-disable-line global-require
|
||||||
} catch (E) {
|
} catch (E) {
|
||||||
if (config.ldap.enabled) {
|
if (config.ldap.enabled) {
|
||||||
log.info('LDAP', 'Module "passport-ldapjs" not installed. LDAP auth will fail.');
|
log.info('LDAP', 'Module "passport-ldapjs" not installed. It will not be used for LDAP auth.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let LdapAuthStrategy;
|
||||||
|
try {
|
||||||
|
LdapAuthStrategy = require('passport-ldapauth').Strategy; // eslint-disable-line global-require
|
||||||
|
} catch (E) {
|
||||||
|
if (config.ldapauth.enabled) {
|
||||||
|
log.info('LDAP', 'Module "passport-ldapauth" not installed. It will not be used for LDAP auth.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +53,8 @@ module.exports.logout = (req, res) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.login = (req, res, next) => {
|
module.exports.login = (req, res, next) => {
|
||||||
passport.authenticate(config.ldap.enabled ? 'ldap' : 'local', (err, user, info) => {
|
let authMode = config.ldapauth.enabled ? 'ldapauth' : config.ldap.enabled ? 'ldap' : 'local';
|
||||||
|
passport.authenticate(authMode, (err, user, info) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
req.flash('danger', err.message);
|
req.flash('danger', err.message);
|
||||||
return next(err);
|
return next(err);
|
||||||
|
@ -73,7 +83,7 @@ module.exports.login = (req, res, next) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
if (config.ldap.enabled && LdapStrategy) {
|
if (config.ldap.enabled && LdapStrategy) {
|
||||||
log.info('Using LDAP auth');
|
log.info('Using LDAP auth (passport-ldapjs)');
|
||||||
|
|
||||||
let opts = {
|
let opts = {
|
||||||
server: {
|
server: {
|
||||||
|
@ -116,6 +126,45 @@ if (config.ldap.enabled && LdapStrategy) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
} else if (config.ldapauth.enabled && LdapAuthStrategy) {
|
||||||
|
log.info("Using LDAP auth (passport-ldapauth)");
|
||||||
|
let opts = {
|
||||||
|
server: {
|
||||||
|
url: 'ldap://' + config.ldap.host + ':' + config.ldap.port,
|
||||||
|
searchBase: config.ldapauth.baseDN,
|
||||||
|
searchFilter: config.ldapauth.filter,
|
||||||
|
searchAttributes: [config.ldapauth.uidTag, 'mail'],
|
||||||
|
bindDN: config.ldapauth.bindUser,
|
||||||
|
bindCredentials: config.ldapauth.bindPassword
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
passport.use(new LdapAuthStrategy(opts, (profile, done) => {
|
||||||
|
users.findByUsername(profile[config.ldapauth.uidTag], (err, user) => {
|
||||||
|
if (err) {
|
||||||
|
return done(err);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
// password is empty for ldap
|
||||||
|
users.add(profile[config.ldapauth.uidTag], '', profile.mail, (err, id) => {
|
||||||
|
if (err) {
|
||||||
|
return done(err);
|
||||||
|
}
|
||||||
|
|
||||||
|
return done(null, {
|
||||||
|
id,
|
||||||
|
username: profile[config.ldapauth.uidTag]
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return done(null, {
|
||||||
|
id: user.id,
|
||||||
|
username: user.username
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}));
|
||||||
} else {
|
} else {
|
||||||
log.info('Using local auth');
|
log.info('Using local auth');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue