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

Fix disabling of crumb plugin via route.options.plugins.crumb: false #166

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

Fix disabling of crumb plugin via route.options.plugins.crumb: false #166

Show file tree
Hide file tree
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
13 changes: 5 additions & 8 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ exports.plugin = {
}
else {
request.route.settings.plugins._crumb = false;
return h.continue;
}
}

Expand All @@ -109,9 +110,7 @@ exports.plugin = {

// Read crumb value from cookie if crumb enabled for this route

if (request.route.settings.plugins._crumb) {
request.plugins.crumb = request.state[settings.key];
}
request.plugins.crumb = request.state[settings.key];

// Generate crumb value if autoGenerate enabled or crumb specifically enabled on route

Expand All @@ -130,9 +129,9 @@ exports.plugin = {

// Validate crumb

const restful = request.route.settings.plugins._crumb ? request.route.settings.plugins._crumb.restful : settings.restful;
const restful = request.route.settings.plugins._crumb.restful;
if (restful) {
if (!internals.restfulValidatedMethods.includes(request.method) || !request.route.settings.plugins._crumb) {
if (!internals.restfulValidatedMethods.includes(request.method)) {
return h.continue;
}

Expand All @@ -153,8 +152,7 @@ exports.plugin = {

// Not restful

if (!request.route.settings.plugins._crumb ||
request.method !== 'post') {
if (request.method !== 'post') {

return h.continue;
}
Expand Down Expand Up @@ -186,7 +184,6 @@ exports.plugin = {

if (settings.addToViewContext &&
request.plugins.crumb &&
request.route.settings.plugins._crumb &&
!response.isBoom &&
response.variety === 'view') {

Expand Down
39 changes: 39 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,45 @@ describe('Crumb', () => {
expect(res.statusCode).to.equal(403);
});

it('does not validate crumb when route.options.plugins.crumb is false', async () => {

const server = Hapi.server();

server.route({
method: 'POST',
path: '/1',
options: {
plugins: {
crumb: false
}
},
handler: (request, h) => 'test'
});

const plugins = [
{
plugin: Crumb
}
];

await server.register(plugins);

const headers = {
'X-API-Token': 'test'
};

const res = await server.inject({
method: 'POST',
url: '/1',
headers
});

const header = res.headers['set-cookie'];

expect(res.statusCode).to.equal(200);
expect(header).to.not.exist();
});

it('does not validate crumb when "skip" option returns true', async () => {

const server = Hapi.server();
Expand Down