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

Enforces login with auth permission #1654

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Enforces login with auth permission #1654

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
7 changes: 7 additions & 0 deletions src/features/auth/login.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { errors, sbvrUtils } from '@balena/pinejs';
import { comparePassword, findUser } from '../../infra/auth/auth.js';
import { loginUserXHR } from '../../infra/auth/jwt.js';
import { captureException } from '../../infra/error-handling/index.js';
import { permissions } from '@balena/pinejs';

import type { SetupOptions } from '../../index.js';

Expand All @@ -28,6 +29,12 @@ export const login =
if (!matches) {
throw new BadRequestError('Current password incorrect.');
}

const userPermissions = await permissions.getUserPermissions(user.id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that you should be able to replace this w/ a middleware.permissionRequired('auth.credentials_login', { statusCode: 400, message: 'User not allowed to login.' }), but

  1. we can't do it that way if we want to only make this check after validating the user's password.
  2. it's not a big deal
  3. we atm do not support that kind of a second argument

if (!userPermissions.includes('auth.credentials_login')) {
throw new BadRequestError('User not allowed to login.');
}

if (onLogin) {
await onLogin(user, tx);
}
Expand Down
51 changes: 51 additions & 0 deletions test/04_session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import { supertest } from './test-lib/supertest.js';
import * as versions from './test-lib/versions.js';
import type { Device } from './test-lib/fake-device.js';
import type { Application } from '../src/balena-model.js';
import {
assignUserRole,
revokeUserRole,
} from '../src/infra/auth/permissions.js';
import { permissions as pinePermissions, sbvrUtils } from '@balena/pinejs';
const { api } = sbvrUtils;

const atob = (x: string) => Buffer.from(x, 'base64').toString('binary');
const parseJwt = (t: string) => JSON.parse(atob(t.split('.')[1]));
Expand Down Expand Up @@ -300,6 +306,51 @@ export default () => {

await supertest(accessToken).get('/actor/v1/whoami').expect(401);
});

it('/login_ returns a 401 error if user does not have auth.credentials_login permission', async function () {
const user = (await supertest(admin).get('/user/v1/whoami').expect(200))
.body;

let role = await api.Auth.get({
resource: 'role',
passthrough: {
req: pinePermissions.rootRead,
},
id: {
name: 'default-user',
},
options: {
$select: 'id',
},
});

expect(role).to.have.property('id').that.is.a('number');
role = role as { id: number };

await sbvrUtils.db.transaction(async (tx) => {
await revokeUserRole(user.id, role.id, tx);
});

await supertest()
.post('/login_')
.send({
username: SUPERUSER_EMAIL,
password: SUPERUSER_PASSWORD,
})
.expect(401);

await sbvrUtils.db.transaction(async (tx) => {
await assignUserRole(user.id, role.id, tx);
});

await supertest()
.post('/login_')
.send({
username: SUPERUSER_EMAIL,
password: SUPERUSER_PASSWORD,
})
.expect(200);
});
});
});
};
Loading