parent
6732150121
commit
5870f6f734
@ -12,6 +12,7 @@
|
|||||||
- [Network selector] Display pool's name [#4885](https://github.com/vatesfr/xen-orchestra/issues/4885) (PR [#4990](https://github.com/vatesfr/xen-orchestra/pull/4990))
|
- [Network selector] Display pool's name [#4885](https://github.com/vatesfr/xen-orchestra/issues/4885) (PR [#4990](https://github.com/vatesfr/xen-orchestra/pull/4990))
|
||||||
- [Usage report] Include CSV raw data files to the sent email [#4970](https://github.com/vatesfr/xen-orchestra/issues/4970) (PR [#4979](https://github.com/vatesfr/xen-orchestra/pull/4979))
|
- [Usage report] Include CSV raw data files to the sent email [#4970](https://github.com/vatesfr/xen-orchestra/issues/4970) (PR [#4979](https://github.com/vatesfr/xen-orchestra/pull/4979))
|
||||||
- [Modal] Don't close pop-up forms when you click outside or press escape (PR [#5002](https://github.com/vatesfr/xen-orchestra/pull/5002))
|
- [Modal] Don't close pop-up forms when you click outside or press escape (PR [#5002](https://github.com/vatesfr/xen-orchestra/pull/5002))
|
||||||
|
- [Plugin/auth-ldap] Support `StartTLS` [#4999](https://github.com/vatesfr/xen-orchestra/issues/4999)
|
||||||
|
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
|
|
||||||
@ -39,6 +40,7 @@
|
|||||||
>
|
>
|
||||||
> In case of conflict, the highest (lowest in previous list) `$version` wins.
|
> In case of conflict, the highest (lowest in previous list) `$version` wins.
|
||||||
|
|
||||||
|
- xo-server-auth-ldap minor
|
||||||
- xo-server-sdn-controller patch
|
- xo-server-sdn-controller patch
|
||||||
- xo-server-usage-report minor
|
- xo-server-usage-report minor
|
||||||
- @xen-orchestra/fs patch
|
- @xen-orchestra/fs patch
|
||||||
|
@ -102,6 +102,10 @@ Or something like this if you also want to filter by group:
|
|||||||
type: 'string',
|
type: 'string',
|
||||||
default: DEFAULTS.filter,
|
default: DEFAULTS.filter,
|
||||||
},
|
},
|
||||||
|
startTls: {
|
||||||
|
title: 'Use StartTLS',
|
||||||
|
type: 'boolean',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
required: ['uri', 'base'],
|
required: ['uri', 'base'],
|
||||||
}
|
}
|
||||||
@ -157,11 +161,13 @@ class AuthLdap {
|
|||||||
bind: credentials,
|
bind: credentials,
|
||||||
base: searchBase,
|
base: searchBase,
|
||||||
filter: searchFilter = DEFAULTS.filter,
|
filter: searchFilter = DEFAULTS.filter,
|
||||||
|
startTls = false,
|
||||||
} = conf
|
} = conf
|
||||||
|
|
||||||
this._credentials = credentials
|
this._credentials = credentials
|
||||||
this._searchBase = searchBase
|
this._searchBase = searchBase
|
||||||
this._searchFilter = searchFilter
|
this._searchFilter = searchFilter
|
||||||
|
this._startTls = startTls
|
||||||
}
|
}
|
||||||
|
|
||||||
load() {
|
load() {
|
||||||
@ -193,6 +199,10 @@ class AuthLdap {
|
|||||||
const client = new Client(this._clientOpts)
|
const client = new Client(this._clientOpts)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
if (this._startTls) {
|
||||||
|
await client.startTLS(this._clientOpts.tlsOptions)
|
||||||
|
}
|
||||||
|
|
||||||
// Bind if necessary.
|
// Bind if necessary.
|
||||||
{
|
{
|
||||||
const { _credentials: credentials } = this
|
const { _credentials: credentials } = this
|
||||||
|
Loading…
Reference in New Issue
Block a user