Skip to content

A local-first personal finance app

[AI] Reject disabled-user sessions in sync-server (#7940)

Matiss Janis Aboltinsc8cb8a223a4f
diff --git a/packages/sync-server/src/account-db.js b/packages/sync-server/src/account-db.js
index 4d53f81325..e880986376 100644
--- a/packages/sync-server/src/account-db.js
+++ b/packages/sync-server/src/account-db.js
@@ -210,7 +210,13 @@ export async function disableOpenID(loginSettings) {
export function getSession(token) {
const accountDb = getAccountDb();
- return accountDb.first('SELECT * FROM sessions WHERE token = ?', [token]);
+ return accountDb.first(
+ `SELECT sessions.*
+ FROM sessions
+ JOIN users ON users.id = sessions.user_id
+ WHERE sessions.token = ? AND users.enabled = 1`,
+ [token],
+ );
}
export function getUserInfo(userId) {
diff --git a/packages/sync-server/src/app-admin.test.js b/packages/sync-server/src/app-admin.test.js
index 79cd8d3be4..529afd5ee5 100644
--- a/packages/sync-server/src/app-admin.test.js
+++ b/packages/sync-server/src/app-admin.test.js
@@ -29,6 +29,78 @@ const createSession = (userId, sessionToken) => {
const generateSessionToken = () => `token-${uuidv4()}`;
+describe('disabled-user session revocation', () => {
+ let adminUserId, adminSessionToken;
+ let targetUserId, targetSessionToken;
+
+ beforeEach(() => {
+ adminUserId = uuidv4();
+ targetUserId = uuidv4();
+ adminSessionToken = generateSessionToken();
+ targetSessionToken = generateSessionToken();
+
+ createUser(adminUserId, 'adminForRevocation', ADMIN_ROLE);
+ createSession(adminUserId, adminSessionToken);
+ createUser(targetUserId, 'targetForRevocation', BASIC_ROLE);
+ createSession(targetUserId, targetSessionToken);
+ });
+
+ afterEach(() => {
+ deleteUser(adminUserId);
+ deleteUser(targetUserId);
+ });
+
+ it('should return 401 when the token belongs to a disabled user', async () => {
+ getAccountDb().mutate('UPDATE users SET enabled = 0 WHERE id = ?', [
+ targetUserId,
+ ]);
+
+ const res = await request(app)
+ .get('/users')
+ .set('x-actual-token', targetSessionToken);
+
+ expect(res.statusCode).toEqual(401);
+ expect(res.body).toHaveProperty('status', 'error');
+ expect(res.body).toHaveProperty('reason', 'unauthorized');
+ });
+
+ it('should remove existing sessions when an admin disables the user', async () => {
+ const res = await request(app)
+ .patch('/users')
+ .send({
+ id: targetUserId,
+ userName: 'targetForRevocation',
+ displayName: 'Target',
+ enabled: false,
+ role: BASIC_ROLE,
+ })
+ .set('x-actual-token', adminSessionToken);
+
+ expect(res.statusCode).toEqual(200);
+
+ const session = getAccountDb().first(
+ 'SELECT token FROM sessions WHERE token = ?',
+ [targetSessionToken],
+ );
+ expect(session).toBeNull();
+ });
+
+ it('should remove existing sessions when an admin deletes the user', async () => {
+ const res = await request(app)
+ .delete('/users')
+ .send({ ids: [targetUserId] })
+ .set('x-actual-token', adminSessionToken);
+
+ expect(res.statusCode).toEqual(200);
+
+ const session = getAccountDb().first(
+ 'SELECT token FROM sessions WHERE token = ?',
+ [targetSessionToken],
+ );
+ expect(session).toBeNull();
+ });
+});
+
describe('/admin', () => {
describe('/owner-created', () => {
it('should return 200 and true if an owner user is created', async () => {
diff --git a/packages/sync-server/src/services/user-service.ts b/packages/sync-server/src/services/user-service.ts
index b39cbb46db..05db991e0c 100644
--- a/packages/sync-server/src/services/user-service.ts
+++ b/packages/sync-server/src/services/user-service.ts
@@ -100,13 +100,23 @@ export function updateUserWithRole(
'UPDATE users SET user_name = ?, display_name = ?, enabled = ?, role = ? WHERE id = ?',
[userName, displayName, enabled, roleId, userId],
);
+ if (!enabled) {
+ getAccountDb().mutate('DELETE FROM sessions WHERE user_id = ?', [userId]);
+ }
});
}
export function deleteUser(userId) {
- return getAccountDb().mutate('DELETE FROM users WHERE id = ? and owner = 0', [
- userId,
- ]).changes;
+ return getAccountDb().transaction(() => {
+ const { changes } = getAccountDb().mutate(
+ 'DELETE FROM users WHERE id = ? and owner = 0',
+ [userId],
+ );
+ if (changes > 0) {
+ getAccountDb().mutate('DELETE FROM sessions WHERE user_id = ?', [userId]);
+ }
+ return changes;
+ });
}
export function deleteUserAccess(userId) {
try {
diff --git a/upcoming-release-notes/7940.md b/upcoming-release-notes/7940.md
new file mode 100644
index 0000000000..a5d979e410
--- /dev/null
+++ b/upcoming-release-notes/7940.md
@@ -0,0 +1,6 @@
+---
+category: Bugfixes
+authors: [MatissJanis]
+---
+
+Invalidate disabled user sessions when using OpenID.