Skip to content

Fix loading JWT when auth subject has no permissions #7894

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

Merged
sulkaharo merged 3 commits into from
Feb 18, 2023
Merged

Fix loading JWT when auth subject has no permissions #7894

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
67e9829
Fix an issue reported by Milos, when a JWT is loaded with a subject t…
sulkaharo Feb 16, 2023
05dd78a
Merge branch 'dev' into wip/sulka/fix_empty_subject
sulkaharo Feb 18, 2023
5752d9e
Add unit test to cover this case
sulkaharo Feb 18, 2023
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
2 changes: 1 addition & 1 deletion lib/authorization/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function init (env, ctx) {
const token = env.enclave.signJWT({ accessToken: subject.accessToken });
const decoded = env.enclave.verifyJWT(token);

var roles = _.uniq(subject.roles.concat(defaultRoles));
var roles = subject.roles ? _.uniq(subject.roles.concat(defaultRoles)) : defaultRoles;

authorized = {
token
Expand Down
14 changes: 14 additions & 0 deletions tests/api.security.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ describe('Security of REST API V1', function() {
});
});

it('Should return a JWT with default roles on broken role token', function(done) {
const now = Math.round(Date.now() / 1000) - 1;
request(self.app)
.get('/api/v2/authorization/request/' + self.token.noneSubject)
.expect(200)
.end(function(err, res) {
const decodedToken = jwt.decode(res.body.token);
decodedToken.accessToken.should.equal(self.token.noneSubject);
decodedToken.iat.should.be.aboveOrEqual(now);
decodedToken.exp.should.be.above(decodedToken.iat);
done();
});
});

it('Data load should succeed with API SECRET', function(done) {
request(self.app)
.get('/api/v1/entries.json')
Expand Down
9 changes: 7 additions & 2 deletions tests/fixtures/api3/authSubject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ async function authSubject (authStorage) {
await createRole(authStorage, 'apiRead', 'api:*:read');
await createRole(authStorage, 'apiUpdate', 'api:*:update');
await createRole(authStorage, 'apiDelete', 'api:*:delete');
await createRole(authStorage, 'noneRole', '');

const subject = {
apiAll: await createTestSubject(authStorage, 'apiAll', ['apiAll']),
Expand All @@ -77,7 +78,9 @@ async function authSubject (authStorage) {
apiDelete: await createTestSubject(authStorage, 'apiDelete', ['apiDelete']),
admin: await createTestSubject(authStorage, 'admin', ['admin']),
readable: await createTestSubject(authStorage, 'readable', ['readable']),
denied: await createTestSubject(authStorage, 'denied', ['denied'])
denied: await createTestSubject(authStorage, 'denied', ['denied']),
noneSubject: await createTestSubject(authStorage, 'noneSubject', null),
noneRole: await createTestSubject(authStorage, 'noneRole', ['noneRole'])
};

const token = {
Expand All @@ -89,7 +92,9 @@ async function authSubject (authStorage) {
delete: subject.apiDelete.accessToken,
denied: subject.denied.accessToken,
adminAll: subject.admin.accessToken,
readable: subject.readable.accessToken
readable: subject.readable.accessToken,
noneSubject: subject.noneSubject.accessToken,
noneRole: subject.noneRole.accessToken
};

return {subject, token};
Expand Down