This repository has been archived by the owner on May 14, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 458
Support sasl authentication #826
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -298,6 +298,46 @@ Client.prototype.bind = function bind (name, | |
return this._send(req, [errors.LDAP_SUCCESS], null, callbackWrapper, _bypass) | ||
} | ||
|
||
/** | ||
* Performs a sasl (NTLM/GSSAPI) authentication against the server. | ||
* | ||
* @param {String} token the token from the authentication http header. | ||
* @param {Control} controls (optional) either a Control or [Control]. | ||
* @param {Function} callback of the form f(err, res). | ||
* @throws {TypeError} on invalid input. | ||
*/ | ||
Client.prototype.saslBind = function saslBind (token, | ||
controls, | ||
callback, | ||
_bypass) { | ||
if (typeof (token) !== 'string' && !Buffer.isBuffer(token)) { | ||
throw new TypeError('token (string or Buffer) required') | ||
} | ||
if (typeof (controls) === 'function') { | ||
callback = controls | ||
controls = [] | ||
} else { | ||
controls = validateControls(controls) | ||
} | ||
Comment on lines
+309
to
+321
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd rather the function accept an input object so that positional parameter inspection is unnecessary. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are you talking about an incopatible change also for There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No. This is a completely new method. There is no reason to carry forward difficult to maintain patterns. |
||
assert.func(callback, 'callback') | ||
|
||
const req = new BindRequest({ | ||
credentials: token || '', | ||
authentication: 'sasl', | ||
controls: controls | ||
}) | ||
|
||
// Connection errors will be reported to the bind callback too (useful when the LDAP server is not available) | ||
const self = this | ||
function callbackWrapper (err, ret) { | ||
self.removeListener('connectError', callbackWrapper) | ||
callback(err, ret) | ||
} | ||
this.addListener('connectError', callbackWrapper) | ||
|
||
return this._send(req, [errors.LDAP_SUCCESS, errors.LDAP_SASL_BIND_IN_PROGRESS], null, callbackWrapper, _bypass) | ||
} | ||
|
||
/** | ||
* Compares an attribute/value pair with an entry on the LDAP server. | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we able to add a corresponding test for this in `client.test.js?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure