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(auth): properly populate request.auth on failed auth #4002

Merged
merged 1 commit into from
Dec 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 6 additions & 5 deletions lib/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,13 @@ internals.validate = function (err, result, name, config, request, errors) {
return internals.missing;
}

request.auth.isAuthenticated = false;
request.auth.strategy = name;
request.auth.credentials = result.credentials;
request.auth.artifacts = result.artifacts;
request.auth.error = err;

if (config.mode === 'try') {
request.auth.isAuthenticated = false;
request.auth.strategy = name;
request.auth.credentials = result.credentials;
request.auth.artifacts = result.artifacts;
request.auth.error = err;
request._log(['auth', 'unauthenticated', 'try', name], err);
return;
}
Expand Down
34 changes: 33 additions & 1 deletion test/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ describe('authentication', () => {
expect(res.statusCode).to.equal(500);
});

it('passes credentials on unauthenticated()', async () => {
it('passes credentials on unauthenticated() in try mode', async () => {

const scheme = () => {

Expand All @@ -1331,6 +1331,38 @@ describe('authentication', () => {
const res = await server.inject('/');
expect(res.statusCode).to.equal(204);
});

it('passes strategy, credentials, artifacts, error on unauthenticated() in required mode', async () => {

const scheme = () => {

return { authenticate: (request, h) => h.unauthenticated(Boom.unauthorized(), { credentials: { user: 'steve' }, artifacts: '!' }) };
};

const server = Hapi.server();
server.ext('onPreResponse', (request, h) => {

if (request.auth.credentials.user === 'steve') {
return h.continue;
}
});
server.ext('onPreResponse', (request, h) => {

expect(request.auth.credentials).to.equal({ user: 'steve' });
expect(request.auth.artifacts).to.equal('!');
expect(request.auth.strategy).to.equal('default');
expect(request.auth.error.message).to.equal('Unauthorized');
return h.continue;
});
server.auth.scheme('custom', scheme);
server.auth.strategy('default', 'custom');
server.auth.default('default', { mode: 'required' });

server.route({ method: 'GET', path: '/', handler: () => null });

const res = await server.inject('/');
expect(res.statusCode).to.equal(401);
});
});

describe('verify()', () => {
Expand Down