mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-19 01:35:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #330 from Skgland/master

Browse source 
Pass through ldap starttls option
This commit is contained in:
Sheogorath 2020-04-23 23:34:46 +02:00 • committed by GitHub
commit d2ace4b2a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/config/default.js
View file

@ -134,7 +134,8 @@ module.exports = {
searchAttributes: undefined, searchAttributes: undefined,
usernameField: undefined, usernameField: undefined,
useridField: undefined, useridField: undefined,
tlsca: undefined tlsca: undefined,
starttls: undefined
}, },
saml: { saml: {
idpSsoUrl: undefined, idpSsoUrl: undefined,

3
lib/web/auth/ldap/index.js
View file

@ -19,7 +19,8 @@ passport.use(new LDAPStrategy({
searchBase: config.ldap.searchBase || null, searchBase: config.ldap.searchBase || null,
searchFilter: config.ldap.searchFilter || null, searchFilter: config.ldap.searchFilter || null,
searchAttributes: config.ldap.searchAttributes || null, searchAttributes: config.ldap.searchAttributes || null,
tlsOptions: config.ldap.tlsOptions || null tlsOptions: config.ldap.tlsOptions || null,
starttls: config.ldap.starttls || null
} }
}, function (user, done) { }, function (user, done) {
var uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined var uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined

3
package.json
View file

@ -137,7 +137,8 @@
"resolutions": { "resolutions": {
"**/tough-cookie": "~2.4.0", "**/tough-cookie": "~2.4.0",
"**/minimatch": "^3.0.2", "**/minimatch": "^3.0.2",
"**/request": "^2.88.0" "**/request": "^2.88.0",
"**/ldapauth-fork": "^4.3.0"
}, },
"engines": { "engines": {
"node": ">=8.x" "node": ">=8.x"