Skip to content

add passReqToCallback option to digest strategy, fixes #56 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add passReqToCallback option to digest strategy, fixes #56 #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions lib/passport-http/strategies/digest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function DigestStrategy(options, secret, validate) {
options = {};
}
if (!secret) throw new Error('HTTP Digest authentication strategy requires a secret function');

passport.Strategy.call(this);
this.name = 'digest';
this._secret = secret;
Expand All @@ -80,6 +80,7 @@ function DigestStrategy(options, secret, validate) {
if (options.qop) {
this._qop = (Array.isArray(options.qop)) ? options.qop : [ options.qop ];
}
this._passReqToCallback = options.passReqToCallback;
}

/**
Expand All @@ -97,28 +98,28 @@ util.inherits(DigestStrategy, passport.Strategy);
DigestStrategy.prototype.authenticate = function(req) {
var authorization = req.headers['authorization'];
if (!authorization) { return this.fail(this._challenge()); }

var parts = authorization.split(' ')
if (parts.length < 2) { return this.fail(400); }

var scheme = parts[0]
, params = parts.slice(1).join(' ');

if (!/Digest/i.test(scheme)) { return this.fail(this._challenge()); }

var creds = parse(params);
if (Object.keys(creds).length === 0) { return this.fail(400); }

if (!creds.username) {
return this.fail(this._challenge());
}
if (req.url !== creds.uri) {
return this.fail(400);
}


var self = this;

// Use of digest authentication requires a password (aka shared secret) known
// to both the client and server, but not transported over the wire. This
// secret is needed in order to compute the hashes required to authenticate
Expand All @@ -128,10 +129,11 @@ DigestStrategy.prototype.authenticate = function(req) {
// However, the user will only be successfully authenticated if the password
// is correct, as indicated by the challenge response matching the computed
// value.
this._secret(creds.username, function(err, user, password) {

function secretCallback (err, user, password) {
if (err) { return self.error(err); }
if (!user) { return self.fail(self._challenge()); }

var ha1;
if (!creds.algorithm || creds.algorithm === 'MD5') {
if (typeof password === 'object' && password.ha1) {
Expand All @@ -151,7 +153,7 @@ DigestStrategy.prototype.authenticate = function(req) {
} else {
return self.fail(400);
}

var ha2;
if (!creds.qop || creds.qop === 'auth') {
ha2 = md5(req.method + ":" + creds.uri);
Expand All @@ -166,7 +168,7 @@ DigestStrategy.prototype.authenticate = function(req) {
} else {
return self.fail(400);
}

var digest;
if (!creds.qop) {
digest = md5(ha1 + ":" + creds.nonce + ":" + ha2);
Expand All @@ -175,7 +177,7 @@ DigestStrategy.prototype.authenticate = function(req) {
} else {
return self.fail(400);
}

if (creds.response != digest) {
return self.fail(self._challenge());
} else {
Expand All @@ -195,7 +197,13 @@ DigestStrategy.prototype.authenticate = function(req) {
self.success(user);
}
}
});
}

if (this._passReqToCallback) {
this._secret(req, creds.username, secretCallback);
} else {
this._secret(creds.username, secretCallback);
}
}

/**
Expand All @@ -206,7 +214,7 @@ DigestStrategy.prototype.authenticate = function(req) {
DigestStrategy.prototype._challenge = function() {
// TODO: For maximum flexibility, a mechanism for delegating the generation
// of the nonce and opaque data to the application would be useful.

var challenge = 'Digest realm="' + this._realm + '"';
if (this._domain) {
challenge += ', domain="' + this._domain.join(' ') + '"';
Expand All @@ -221,7 +229,7 @@ DigestStrategy.prototype._challenge = function() {
if (this._qop) {
challenge += ', qop="' + this._qop.join(',') + '"';
}

return challenge;
}

Expand Down Expand Up @@ -294,5 +302,5 @@ function md5(str, encoding){

/**
* Expose `DigestStrategy`.
*/
*/
module.exports = DigestStrategy;