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.

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

Jump to bottom

New option for csrf #2121

Merged
merged 3 commits into from
Aug 18, 2014
Merged

New option for csrf #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24dd95d
New option for csrf
pjpoirson Aug 16, 2014
88fc410
Merge remote-tracking branch 'core/master'
pjpoirson Aug 18, 2014
f2dbf6a
New csrf test
pjpoirson Aug 18, 2014
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
16 changes: 11 additions & 5 deletions lib/hooks/csrf/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ module.exports = function(sails) {
sails.config.csrf = {
grantTokenViaAjax: true,
protectionEnabled: true,
origin: '-'
origin: '-',
routesDisabled: '-'
};
}
else if (sails.config.csrf === false) {
sails.config.csrf = {
grantTokenViaAjax: false,
protectionEnabled: false,
origin: '-'
origin: '-',
routesDisabled: '-'
};
}
// If user provides ANY object (including empty object), enable all default
Expand All @@ -44,7 +46,8 @@ module.exports = function(sails) {
_.defaults(typeof sails.config.csrf === 'object' ? sails.config.csrf : {}, {
grantTokenViaAjax: true,
protectionEnabled: true,
origin: '-'
origin: '-',
routesDisabled: '-'
});
}
// Add the csrfToken directly to the config'd routes, so that the CORS hook can process it
Expand All @@ -63,12 +66,15 @@ module.exports = function(sails) {
var connect = require('express/node_modules/connect');

return connect.csrf()(req, res, function(err) {

var isRouteDisabled = sails.config.csrf.routesDisabled.split(',').indexOf(req.path) > -1;

if (util.isSameOrigin(req) || allowCrossOriginCSRF) {
res.locals._csrf = req.csrfToken();
} else {
res.locals._csrf = null;
}
if (err) {
if (err && !isRouteDisabled) {
// Return an Access-Control-Allow-Origin header in case this is a xdomain request
if (req.headers.origin) {
res.set('Access-Control-Allow-Origin', req.headers.origin);
Expand Down Expand Up @@ -109,4 +115,4 @@ function csrfToken (req, res, next) {
return res.json({
_csrf: res.locals._csrf
});
}
}
26 changes: 26 additions & 0 deletions test/integration/hook.cors_csrf.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,32 @@ describe('CORS and CSRF ::', function() {

});

describe("with CSRF set to {protectionEnabled: true, routesDisabled: '/user'}", function() {

before(function() {
fs.writeFileSync(path.resolve('../', appName, 'config/csrf.js'), "module.exports.csrf = {protectionEnabled: true, routesDisabled: '/user'};");
});

it("a POST request on /user without a CSRF token should result in a 200 response", function (done) {
httpHelper.testRoute("post", 'user', function (err, response) {
if (err) return done(new Error(err));
assert.equal(response.statusCode, 200);
done();
});

});

it("a POST request on /test without a CSRF token should result in a 403 response", function (done) {
httpHelper.testRoute("post", 'test', function (err, response) {
if (err) return done(new Error(err));
assert.equal(response.statusCode, 403);
done();
});

});

});

});

describe("CORS+CSRF ::", function () {
Expand Down