64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
diff --git a/node_modules/ldapauth-fork/lib/ldapauth.js b/node_modules/ldapauth-fork/lib/ldapauth.js
|
|
index 85ecf36a8b..a7d07e0f78 100644
|
|
--- a/node_modules/ldapauth-fork/lib/ldapauth.js
|
|
+++ b/node_modules/ldapauth-fork/lib/ldapauth.js
|
|
@@ -69,6 +69,7 @@ function LdapAuth(opts) {
|
|
this.opts.bindProperty || (this.opts.bindProperty = 'dn');
|
|
this.opts.groupSearchScope || (this.opts.groupSearchScope = 'sub');
|
|
this.opts.groupDnProperty || (this.opts.groupDnProperty = 'dn');
|
|
+ this.opts.tlsStarted = false;
|
|
|
|
EventEmitter.call(this);
|
|
|
|
@@ -108,21 +109,7 @@ function LdapAuth(opts) {
|
|
this._userClient.on('error', this._handleError.bind(this));
|
|
|
|
var self = this;
|
|
- if (this.opts.starttls) {
|
|
- // When starttls is enabled, this callback supplants the 'connect' callback
|
|
- this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function(err) {
|
|
- if (err) {
|
|
- self._handleError(err);
|
|
- } else {
|
|
- self._onConnectAdmin();
|
|
- }
|
|
- });
|
|
- this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function(err) {
|
|
- if (err) {
|
|
- self._handleError(err);
|
|
- }
|
|
- });
|
|
- } else if (opts.reconnect) {
|
|
+ if (opts.reconnect && !this.opts.starttls) {
|
|
this.once('_installReconnectListener', function() {
|
|
self.log && self.log.trace('install reconnect listener');
|
|
self._adminClient.on('connect', function() {
|
|
@@ -384,6 +371,28 @@ LdapAuth.prototype._findGroups = function(user, callback) {
|
|
*/
|
|
LdapAuth.prototype.authenticate = function(username, password, callback) {
|
|
var self = this;
|
|
+ if (this.opts.starttls && !this.opts.tlsStarted) {
|
|
+ // When starttls is enabled, this callback supplants the 'connect' callback
|
|
+ this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function (err) {
|
|
+ if (err) {
|
|
+ self._handleError(err);
|
|
+ } else {
|
|
+ self._onConnectAdmin(function(){self._handleAuthenticate(username, password, callback);});
|
|
+ }
|
|
+ });
|
|
+ this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function (err) {
|
|
+ if (err) {
|
|
+ self._handleError(err);
|
|
+ }
|
|
+ });
|
|
+ } else {
|
|
+ self._handleAuthenticate(username, password, callback);
|
|
+ }
|
|
+};
|
|
+
|
|
+LdapAuth.prototype._handleAuthenticate = function (username, password, callback) {
|
|
+ this.opts.tlsStarted = true;
|
|
+ var self = this;
|
|
|
|
if (typeof password === 'undefined' || password === null || password === '') {
|
|
return callback(new Error('no password given'));
|