NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-server-auth-ldap): upgrade ldapts dep

Browse Source 
Necessary for 5870f6f73

Also, only pass `tlsOptions` when creating client when using `ldaps`.
This commit is contained in:
Julien Fontanet 2020-05-17 16:11:24 +02:00
parent 5870f6f734
commit c820646fb6
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/xo-server-auth-ldap/package.json
View File

@ -31,12 +31,12 @@
"dist/"
],
"engines": {
"node": ">=6"
"node": ">=10"
},
"dependencies": {
"exec-promise": "^0.7.0",
"inquirer": "^7.0.0",
"ldapts": "1.10.0",
"ldapts": "^2.2.1",
"promise-toolbox": "^0.15.0"
},
"devDependencies": {

7
packages/xo-server-auth-ldap/src/index.js
View File

@ -138,7 +138,6 @@ class AuthLdap {
const clientOpts = (this._clientOpts = {
url: conf.uri,
maxConnections: 5,
tlsOptions: {},
})
{
@ -147,7 +146,7 @@ class AuthLdap {
certificateAuthorities,
} = conf
const { tlsOptions } = clientOpts
const tlsOptions = (this._tlsOptions = {})
tlsOptions.rejectUnauthorized = checkCertificate
if (certificateAuthorities) {
@ -155,6 +154,10 @@ class AuthLdap {
certificateAuthorities.map(path => fromCallback(readFile, path))
)
}
if (clientOpts.url.startsWith('ldaps:')) {
clientOpts.tlsOptions = tlsOptions
}
}
const {

30
yarn.lock
View File

@ -2013,10 +2013,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f"
integrity sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==
"@types/node@~8.10.54":
version "8.10.59"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04"
integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==
"@types/node@~10.17.19":
version "10.17.21"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.21.tgz#c00e9603399126925806bed2d9a1e37da506965e"
integrity sha512-PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@ -2040,6 +2040,11 @@
dependencies:
"@types/node" "*"
"@types/uuid@~7.0.2":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.3.tgz#45cd03e98e758f8581c79c535afbd4fc27ba7ac8"
integrity sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==
"@types/yargs-parser@*":
version "13.1.0"
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
@ -9517,16 +9522,18 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"
ldapts@1.10.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/ldapts/-/ldapts-1.10.0.tgz#8fa4487ba6814f024bf4e92553baaa5eceea0e6c"
integrity sha512-5L06EuLEXGbStDyhrT31Fp+4tNFzOUnd1Unz5GCbNM1IemtHmxlBujVHhsgT6AUq5RXWhMUUvuXZrDt7XMa95Q==
ldapts@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ldapts/-/ldapts-2.2.1.tgz#df9c7a19c9165b0ee94f474249e3ecfbece4a7d2"
integrity sha512-Qr7ruJ7/Pss55zQHXxswlySZ2IHtMLViP/mql9/XbTenYtZjAUYVFRqjmAo44vEztZkjPiwxOONHTH+dzZ2U7g==
dependencies:
"@types/asn1" "~0.2.0"
"@types/node" "~8.10.54"
"@types/node" "~10.17.19"
"@types/uuid" "~7.0.2"
asn1 "~0.2.4"
debug "~4.1.1"
strict-event-emitter-types "~2.0.0"
uuid "~7.0.3"
lead@^1.0.0:
version "1.0.0"
@ -14899,6 +14906,11 @@ uuid@^3.0.1, uuid@^3.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
uuid@~7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
v8-compile-cache@^2.0.3:
version "2.1.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"