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

Fixed order of checks in authorize-handler #112

Merged
merged 2 commits into from
Aug 25, 2022
Merged

Fixed order of checks in authorize-handler #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f67f02b
fixed order of checks for issue 89 point 11, original pr 565
Dec 26, 2021
7a61930
Merge branch 'v4.3.0-dev' into 89_11_565
jankapunkt Aug 25, 2022
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
6 changes: 1 addition & 5 deletions lib/handlers/authorize-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ AuthorizeHandler.prototype.handle = function(request, response) {
throw new InvalidArgumentError('Invalid argument: `response` must be an instance of Response');
}

if (request.query.allowed === 'false' || request.body.allowed === 'false') {
return Promise.reject(new AccessDeniedError('Access denied: user denied access to application'));
}

const fns = [
this.getAuthorizationCodeLifetime(),
this.getClient(request),
Expand All @@ -98,7 +94,7 @@ AuthorizeHandler.prototype.handle = function(request, response) {
return Promise.bind(this)
.then(function() {
state = this.getState(request);
if(request.query.allowed === 'false') {
if (request.query.allowed === 'false' || request.body.allowed === 'false') {
throw new AccessDeniedError('Access denied: user denied access to application');
}
})
Expand Down
38 changes: 9 additions & 29 deletions test/integration/handlers/authorize-handler_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ describe('AuthorizeHandler integration', function() {
}
});

it('should throw an error if `allowed` is `false`', function() {
it('should redirect to an error response if user denied access', function() {
const model = {
getAccessToken: function() {
return {
Expand All @@ -170,49 +170,29 @@ describe('AuthorizeHandler integration', function() {
getClient: function() {
return { grants: ['authorization_code'], redirectUris: ['http://example.com/cb'] };
},
saveAuthorizationCode: function() {
throw new Error('Unhandled exception');
}
saveAuthorizationCode: function() {}
};
const handler = new AuthorizeHandler({ authorizationCodeLifetime: 120, model: model });
const request = new Request({
body: {
client_id: 'test'
client_id: 12345,
response_type: 'code'
},
method: {},
headers: {
'Authorization': 'Bearer foo'
},
method: {},
query: {
allowed: 'false',
state: 'foobar'
state: 'foobar',
allowed: 'false'
}
});
const response = new Response({ body: {}, headers: {} });

return handler.handle(request, response)
.then(should.fail)
.catch(function(e) {
e.should.be.an.instanceOf(AccessDeniedError);
e.message.should.equal('Access denied: user denied access to application');
});
});

it('should throw an error if `allowed` is `false` body', function() {
const model = {
getAccessToken: function() {},
getClient: function() {},
saveAuthorizationCode: function() {}
};
const handler = new AuthorizeHandler({ authorizationCodeLifetime: 120, model: model });
const request = new Request({ body: { allowed: 'false' }, headers: {}, method: {}, query: {} });
const response = new Response({ body: {}, headers: {} });

return handler.handle(request, response)
.then(should.fail)
.catch(function(e) {
e.should.be.an.instanceOf(AccessDeniedError);
e.message.should.equal('Access denied: user denied access to application');
.catch(function() {
response.get('location').should.equal('http://example.com/cb?error=access_denied&error_description=Access%20denied%3A%20user%20denied%20access%20to%20application&state=foobar');
});
});

Expand Down