Skip to content
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.

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

Fix multi saml strategy race conditions #426

Merged
merged 2 commits into from
Jul 21, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
18 changes: 12 additions & 6 deletions multiSamlStrategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ MultiSamlStrategy.prototype.authenticate = function (req, options) {
return self.error(err);
}

self._saml = new saml.SAML(Object.assign({}, self._options, samlOptions));
self.constructor.super_.prototype.authenticate.call(self, req, options);
var samlService = new saml.SAML(Object.assign({}, self._options, samlOptions));
var strategy = Object.assign({}, self, {_saml: samlService});
Object.setPrototypeOf(strategy, self);
self.constructor.super_.prototype.authenticate.call(strategy, req, options);
});
};

Expand All @@ -44,8 +46,10 @@ MultiSamlStrategy.prototype.logout = function (req, callback) {
return callback(err);
}

self._saml = new saml.SAML(Object.assign({}, self._options, samlOptions));
self.constructor.super_.prototype.logout.call(self, req, callback);
var samlService = new saml.SAML(Object.assign({}, self._options, samlOptions));
var strategy = Object.assign({}, self, {_saml: samlService});
Object.setPrototypeOf(strategy, self);
self.constructor.super_.prototype.logout.call(strategy, req, callback);
});
};

Expand All @@ -61,8 +65,10 @@ MultiSamlStrategy.prototype.generateServiceProviderMetadata = function( req, dec
return callback(err);
}

self._saml = new saml.SAML(Object.assign({}, self._options, samlOptions));
return callback(null, self.constructor.super_.prototype.generateServiceProviderMetadata.call(self, decryptionCert, signingCert ));
var samlService = new saml.SAML(Object.assign({}, self._options, samlOptions));
var strategy = Object.assign({}, self, {_saml: samlService});
Object.setPrototypeOf(strategy, self);
return callback(null, self.constructor.super_.prototype.generateServiceProviderMetadata.call(strategy, decryptionCert, signingCert));
});
};

Expand Down
20 changes: 14 additions & 6 deletions test/multiSamlStrategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ describe('strategy#authenticate', function() {
});

it('uses given options to setup internal saml provider', function(done) {
var superAuthenticateStub = this.superAuthenticateStub;
var samlOptions = {
issuer: 'http://foo.issuer',
callbackUrl: 'http://foo.callback',
Expand All @@ -84,7 +85,9 @@ describe('strategy#authenticate', function() {
function getSamlOptions (req, fn) {
try {
fn(null, samlOptions);
strategy._saml.options.should.containEql(Object.assign({},
sinon.assert.calledOnce(superAuthenticateStub)
superAuthenticateStub.calledWith(Object.assign(
{},
{ cacheProvider: 'mock cache provider' },
samlOptions
));
Expand All @@ -104,19 +107,19 @@ describe('strategy#authenticate', function() {

describe('strategy#logout', function() {
beforeEach(function() {
this.superAuthenticateStub = sinon.stub(SamlStrategy.prototype, 'logout');
this.superLogoutMock = sinon.stub(SamlStrategy.prototype, 'logout');
});

afterEach(function() {
this.superAuthenticateStub.restore();
this.superLogoutMock.restore();
});

it('calls super with request and auth options', function(done) {
var superAuthenticateStub = this.superAuthenticateStub;
var superLogoutMock = this.superLogoutMock;
function getSamlOptions (req, fn) {
try {
fn();
sinon.assert.calledOnce(superAuthenticateStub);
sinon.assert.calledOnce(superLogoutMock);
done();
} catch (err2) {
done(err2);
Expand Down Expand Up @@ -148,6 +151,7 @@ describe('strategy#logout', function() {
});

it('uses given options to setup internal saml provider', function(done) {
var superLogoutMock = this.superLogoutMock;
var samlOptions = {
issuer: 'http://foo.issuer',
callbackUrl: 'http://foo.callback',
Expand All @@ -164,7 +168,11 @@ describe('strategy#logout', function() {
function getSamlOptions (req, fn) {
try {
fn(null, samlOptions);
strategy._saml.options.should.containEql(samlOptions);
sinon.assert.calledOnce(superLogoutMock)
superLogoutMock.calledWith(Object.assign(
{},
samlOptions
));
done();
} catch (err2) {
done(err2);
Expand Down