A local-first personal finance app
[AI] Block bank sync for deleted budgets (#9266)
Julian Dominguez-Schatz0c571bc4766c
diff --git a/packages/sync-server/src/app-pluggyai/app-pluggyai.js b/packages/sync-server/src/app-pluggyai/app-pluggyai.jsindex cf3564d170..aa552c0226 100644--- a/packages/sync-server/src/app-pluggyai/app-pluggyai.js+++ b/packages/sync-server/src/app-pluggyai/app-pluggyai.js@@ -1,6 +1,5 @@import express from 'express';-import { isAdmin } from '#account-db';import { handleError } from '#app-gocardless/util/handle-error';import { SecretName, secretsService } from '#services/secrets-service';import * as UserService from '#services/user-service';@@ -18,10 +17,6 @@ app.use(requestLoggerMiddleware);app.use(express.json());app.use(validateSessionMiddleware);-function canAccessFile(fileId, userId) {- return isAdmin(userId) || UserService.countUserAccess(fileId, userId) > 0;-}-app.post('/status',handleError(async (req, res) => {@@ -36,7 +31,7 @@ app.post(return;}- if (!canAccessFile(fileId, res.locals.user_id)) {+ if (!UserService.canAccessActiveFile(fileId, res.locals.user_id)) {res.status(403).send({status: 'error',reason: 'file-access-denied',@@ -72,7 +67,7 @@ app.post(return;}- if (!canAccessFile(fileId, res.locals.user_id)) {+ if (!UserService.canAccessActiveFile(fileId, res.locals.user_id)) {res.status(403).send({status: 'error',reason: 'file-access-denied',@@ -140,7 +135,7 @@ app.post(return;}- if (!canAccessFile(fileId, res.locals.user_id)) {+ if (!UserService.canAccessActiveFile(fileId, res.locals.user_id)) {res.status(403).send({status: 'error',reason: 'file-access-denied',diff --git a/packages/sync-server/src/app-sync.ts b/packages/sync-server/src/app-sync.tsindex ebb04dd94b..45bf77d049 100644--- a/packages/sync-server/src/app-sync.ts+++ b/packages/sync-server/src/app-sync.ts@@ -26,6 +26,7 @@ import {validateUploadedFile,} from './app-sync/validation';import { config } from './load-config';+import { SecretName, secretsService } from './services/secrets-service';import * as UserService from './services/user-service';import * as simpleSync from './sync-simple';import {@@ -557,7 +558,8 @@ app.post('/delete-user-file', (req, res) => {return;}- const filesService = new FilesService(getAccountDb());+ const accountDb = getAccountDb();+ const filesService = new FilesService(accountDb);const file = verifyFileExists(fileId, filesService, res, 'file-not-found');if (!file) {return;@@ -570,7 +572,12 @@ app.post('/delete-user-file', (req, res) => {return;}- filesService.update(file.id, new FileUpdate({ deleted: true }));+ accountDb.transaction(() => {+ filesService.update(file.id, new FileUpdate({ deleted: true }));+ for (const name of Object.values(SecretName)) {+ secretsService.reset(name, file.id);+ }+ });res.send(OK_RESPONSE);});diff --git a/packages/sync-server/src/deleted-budget-bank-sync.test.ts b/packages/sync-server/src/deleted-budget-bank-sync.test.tsnew file mode 100644index 0000000000..e511304b0b--- /dev/null+++ b/packages/sync-server/src/deleted-budget-bank-sync.test.ts@@ -0,0 +1,156 @@+import request from 'supertest';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { getAccountDb } from './account-db';+import { handlers as pluggy } from './app-pluggyai/app-pluggyai';+import { pluggyaiService } from './app-pluggyai/pluggyai-service';+import { handlers as sync } from './app-sync';+import { SecretName, secretsService } from './services/secrets-service';++const fileId = 'deleted-bank-sync-budget';+const otherFileId = 'other-bank-sync-budget';+let globalToken: string | null;++beforeEach(() => {+ globalToken = secretsService.get(SecretName.simplefin_token);+ secretsService.set(SecretName.simplefin_token, 'global-secret');+ getAccountDb().mutate(+ 'INSERT INTO files (id, deleted, owner) VALUES (?, 0, ?)',+ [fileId, 'genericUser'],+ );+});++afterEach(() => {+ vi.restoreAllMocks();+ if (globalToken === null) {+ secretsService.reset(SecretName.simplefin_token);+ } else {+ secretsService.set(SecretName.simplefin_token, globalToken);+ }+ getAccountDb().mutate('DELETE FROM user_access WHERE file_id = ?', [fileId]);+ getAccountDb().mutate('DELETE FROM files WHERE id = ?', [fileId]);+ for (const name of Object.values(SecretName)) {+ secretsService.reset(name, fileId);+ secretsService.reset(name, otherFileId);+ }+});++describe('deleted budget bank sync', () => {+ it.each(['valid-token-admin', 'valid-token-user'])(+ 'rejects deleted and missing budgets for %s before selecting credentials',+ async token => {+ const source = vi.spyOn(pluggyaiService, 'getCredentialSource');+ await request(pluggy)+ .post('/status')+ .set('x-actual-token', token)+ .set('X-Actual-File-Id', fileId)+ .expect(200);+ getAccountDb().mutate('UPDATE files SET deleted = 1 WHERE id = ?', [+ fileId,+ ]);+ source.mockClear();+ for (const id of [fileId, 'missing-bank-sync-budget']) {+ for (const path of ['/status', '/accounts', '/transactions']) {+ await request(pluggy)+ .post(path)+ .set('x-actual-token', token)+ .set('X-Actual-File-Id', id)+ .expect(403);+ }+ }+ expect(source).not.toHaveBeenCalled();+ },+ );++ it('rejects deleted budgets even when a sharing record remains', async () => {+ getAccountDb().mutate('UPDATE files SET owner = ? WHERE id = ?', [+ 'genericAdmin',+ fileId,+ ]);+ getAccountDb().mutate(+ 'INSERT INTO user_access (file_id, user_id) VALUES (?, ?)',+ [fileId, 'genericUser'],+ );+ await request(pluggy)+ .post('/status')+ .set('x-actual-token', 'valid-token-user')+ .set('X-Actual-File-Id', fileId)+ .expect(200);+ getAccountDb().mutate('UPDATE files SET deleted = 1 WHERE id = ?', [+ fileId,+ ]);+ const denied = await request(pluggy)+ .post('/status')+ .set('x-actual-token', 'valid-token-user')+ .set('X-Actual-File-Id', fileId);+ expect(denied.status).toBe(403);+ });++ it('rolls back deletion and earlier secret resets when cleanup fails, allowing a retry', async () => {+ const db = getAccountDb();+ const names = [SecretName.simplefin_token, SecretName.simplefin_accessKey];+ for (const name of names) {+ secretsService.set(name, 'budget-secret', fileId);+ }+ db.exec(`CREATE TEMP TRIGGER fail_secret_cleanup BEFORE DELETE ON secrets+ WHEN OLD.name = 'simplefin_accessKey:deleted-bank-sync-budget'+ BEGIN SELECT RAISE(ABORT, 'simulated cleanup failure'); END`);+ try {+ await request(sync)+ .post('/delete-user-file')+ .set('x-actual-token', 'valid-token-user')+ .send({ fileId })+ .expect(500);+ expect(+ db.first('SELECT deleted FROM files WHERE id = ?', [fileId]),+ ).toEqual({ deleted: 0 });+ for (const name of names) {+ expect(secretsService.get(name, fileId)).toBe('budget-secret');+ }+ } finally {+ db.exec('DROP TRIGGER fail_secret_cleanup');+ }+ await request(sync)+ .post('/delete-user-file')+ .set('x-actual-token', 'valid-token-user')+ .send({ fileId })+ .expect(200);+ expect(+ db.first('SELECT deleted FROM files WHERE id = ?', [fileId]),+ ).toEqual({ deleted: 1 });+ for (const name of names) {+ expect(secretsService.get(name, fileId)).toBeNull();+ }+ });++ it('clears only the deleted budget secrets through the deletion endpoint', async () => {+ const globals = Object.values(SecretName).map(name =>+ secretsService.get(name),+ );+ for (const name of Object.values(SecretName)) {+ secretsService.set(name, 'deleted-budget-secret', fileId);+ secretsService.set(name, 'other-budget-secret', otherFileId);+ }+ await request(sync)+ .post('/delete-user-file')+ .set('x-actual-token', 'valid-token-user')+ .send({ fileId })+ .expect(200);+ for (const name of Object.values(SecretName)) {+ expect(secretsService.get(name, fileId)).toBeNull();+ expect(secretsService.get(name, otherFileId)).toBe('other-budget-secret');+ }+ expect(+ Object.values(SecretName).map(name => secretsService.get(name)),+ ).toEqual(globals);+ const denied = await request(pluggy)+ .post('/status')+ .set('x-actual-token', 'valid-token-user')+ .set('X-Actual-File-Id', fileId);+ expect(denied.status).toBe(403);+ await request(pluggy)+ .post('/status')+ .set('x-actual-token', 'valid-token-admin')+ .expect(200);+ });+});diff --git a/packages/sync-server/src/services/secrets-service.js b/packages/sync-server/src/services/secrets-service.jsindex 025dad7e55..ec5fbda2dd 100644--- a/packages/sync-server/src/services/secrets-service.js+++ b/packages/sync-server/src/services/secrets-service.js@@ -103,6 +103,10 @@ export const secretsService = {return secretsDb.set(name, value, fileId);},+ /**+ * @param {SecretName} name+ * @param {string|null} [fileId]+ */reset: (name, fileId = null) => {return secretsDb.reset(name, fileId);},diff --git a/packages/sync-server/src/services/user-service.ts b/packages/sync-server/src/services/user-service.tsindex ce566b434e..35d7d19189 100644--- a/packages/sync-server/src/services/user-service.ts+++ b/packages/sync-server/src/services/user-service.ts@@ -1,5 +1,5 @@// @ts-strict-ignore-import { getAccountDb } from '#account-db';+import { getAccountDb, isAdmin } from '#account-db';export function getUserByUsername(userName) {if (!userName || typeof userName !== 'string') {@@ -154,6 +154,14 @@ export function getUserAccess(fileId, userId, isAdmin) {);}+export function canAccessActiveFile(fileId: string, userId: string): boolean {+ const file = getAccountDb().first(+ 'SELECT id FROM files WHERE id = ? AND deleted = 0',+ [fileId],+ );+ return !!file && (isAdmin(userId) || countUserAccess(fileId, userId) > 0);+}+export function countUserAccess(fileId, userId) {const { accessCount } =getAccountDb().first(diff --git a/upcoming-release-notes/deleted-budget-bank-sync.md b/upcoming-release-notes/deleted-budget-bank-sync.mdnew file mode 100644index 0000000000..833aac499e--- /dev/null+++ b/upcoming-release-notes/deleted-budget-bank-sync.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [jfdoming]+---++Prevent per-budget bank sync credential reuse after a budget is deleted