diff options
author | Wu Cheng-Han | 2017-02-07 21:17:05 +0800 |
---|---|---|
committer | Wu Cheng-Han | 2017-02-07 21:17:05 +0800 |
commit | bbbf64aae465ed46505f4945080fa2d72e8d0b2b (patch) | |
tree | 0a10a447bad7e191c0ccf9c76d58cb268eb2e3a1 /lib | |
parent | d6822dd410f0356322c2cdb402a95ccbbdeeb208 (diff) |
Fix HMD_LDAP_TLS_CA not passing correctly and update README.md
Diffstat (limited to '')
-rw-r--r-- | lib/config.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/config.js b/lib/config.js index 3816017e..e765d730 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,4 +1,5 @@ // external modules +var fs = require('fs'); var path = require('path'); // configs @@ -123,9 +124,17 @@ if (process.env.HMD_LDAP_SEARCHATTRIBUTES) ldap.searchAttributes = process.env.HMD_LDAP_SEARCHATTRIBUTES; if (process.env.HMD_LDAP_TLS_CA) { var ca = { - ca: process.env.HMD_LDAP_TLS_CA + ca: process.env.HMD_LDAP_TLS_CA.split(',') + } + ldap.tlsOptions = ldap.tlsOptions ? Object.assign(ldap.tlsOptions, ca) : ca; + if (Array.isArray(ldap.tlsOptions.ca) && ldap.tlsOptions.ca.length > 0) { + var i, len, results; + results = []; + for (i = 0, len = ldap.tlsOptions.ca.length; i < len; i++) { + results.push(fs.readFileSync(ldap.tlsOptions.ca[i], 'utf8')); + } + ldap.tlsOptions.ca = results; } - ldap.tlsOptions = ldap.tlsOptions ? Object.assign(ldap.tlsOptions, ca) : ca } if (process.env.HMD_LDAP_PROVIDERNAME) { ldap.providerName = process.env.HMD_LDAP_PROVIDERNAME; |