A local-first personal finance app
[AI] Restrict owner-only sync-server file management endpoints (#7977)
Matiss Janis Aboltins18a8dc03c48e
diff --git a/packages/sync-server/src/app-sync.test.ts b/packages/sync-server/src/app-sync.test.tsindex 97854c4b84..510a8efc44 100644--- a/packages/sync-server/src/app-sync.test.ts+++ b/packages/sync-server/src/app-sync.test.ts@@ -227,6 +227,39 @@ describe('/user-create-key', () => {expect(rows[0].encrypt_test).toEqual(encrypt_test);});+ it('returns 403 when a shared user (user_access only) tries to create a key on a file owned by someone else', async () => {+ const fileId = crypto.randomBytes(16).toString('hex');+ getAccountDb().mutate(+ 'INSERT INTO files (id, encrypt_salt, encrypt_keyid, encrypt_test, owner) VALUES (?, ?, ?, ?, ?)',+ [fileId, 'old-salt', 'old-key', 'old-test', OTHER_USER_ID],+ );+ getAccountDb().mutate(+ 'INSERT INTO user_access (file_id, user_id) VALUES (?, ?)',+ [fileId, 'genericUser'],+ );++ const res = await request(app)+ .post('/user-create-key')+ .set('x-actual-token', 'valid-token-user')+ .send({+ fileId,+ keyId: 'attacker-key',+ keySalt: 'attacker-salt',+ testContent: 'attacker-test',+ });++ expect(res.statusCode).toEqual(403);+ expect(res.text).toEqual('file-access-not-allowed');++ const rows = getAccountDb().all(+ 'SELECT encrypt_salt, encrypt_keyid, encrypt_test FROM files WHERE id = ?',+ [fileId],+ );+ expect(rows[0].encrypt_salt).toEqual('old-salt');+ expect(rows[0].encrypt_keyid).toEqual('old-key');+ expect(rows[0].encrypt_test).toEqual('old-test');+ });+it('creates a new encryption key for the file', async () => {const fileId = crypto.randomBytes(16).toString('hex');@@ -366,6 +399,32 @@ describe('/reset-user-file', () => {]);expect(rows[0].group_id).toBeNull();});++ it('returns 403 when a shared user (user_access only) tries to reset a file owned by someone else', async () => {+ const fileId = crypto.randomBytes(16).toString('hex');+ const groupId = 'shared-user-reset-group-id';+ getAccountDb().mutate(+ 'INSERT INTO files (id, group_id, deleted, owner) VALUES (?, ?, FALSE, ?)',+ [fileId, groupId, OTHER_USER_ID],+ );+ getAccountDb().mutate(+ 'INSERT INTO user_access (file_id, user_id) VALUES (?, ?)',+ [fileId, 'genericUser'],+ );++ const res = await request(app)+ .post('/reset-user-file')+ .set('x-actual-token', 'valid-token-user')+ .send({ fileId });++ expect(res.statusCode).toEqual(403);+ expect(res.text).toEqual('file-access-not-allowed');++ const rows = getAccountDb().all('SELECT group_id FROM files WHERE id = ?', [+ fileId,+ ]);+ expect(rows[0].group_id).toEqual(groupId);+ });});describe('/upload-user-file', () => {@@ -1287,6 +1346,34 @@ describe('/delete-user-file', () => {]);expect(rows[0].deleted).toBe(1);});++ it('returns 403 when a shared user (user_access only) tries to delete a file owned by someone else', async () => {+ const accountDb = getAccountDb();+ const fileId = crypto.randomBytes(16).toString('hex');++ // File owned by another user; genericUser only has shared user_access.+ accountDb.mutate(+ 'INSERT OR IGNORE INTO files (id, deleted, owner) VALUES (?, FALSE, ?)',+ [fileId, OTHER_USER_ID],+ );+ accountDb.mutate(+ 'INSERT INTO user_access (file_id, user_id) VALUES (?, ?)',+ [fileId, 'genericUser'],+ );++ const res = await request(app)+ .post('/delete-user-file')+ .set('x-actual-token', 'valid-token-user')+ .send({ fileId });++ expect(res.statusCode).toEqual(403);+ expect(res.text).toEqual('file-access-not-allowed');++ const rows = accountDb.all('SELECT deleted FROM files WHERE id = ?', [+ fileId,+ ]);+ expect(rows[0].deleted).toBe(0);+ });});describe('/sync', () => {diff --git a/packages/sync-server/src/app-sync.ts b/packages/sync-server/src/app-sync.tsindex d956f343c6..5d09adb5ef 100644--- a/packages/sync-server/src/app-sync.ts+++ b/packages/sync-server/src/app-sync.ts@@ -116,12 +116,19 @@ const verifyFileExists = (}};-function requireFileAccess(file: File, userId: string) {+function requireFileOwner(file: File, userId: string) {const isOwner = file.owner === userId;const isServerAdmin = isAdmin(userId);if (isOwner || isServerAdmin) {return null;}+ return 'file-access-not-allowed';+}++function requireFileAccess(file: File, userId: string) {+ if (requireFileOwner(file, userId) === null) {+ return null;+ }if (UserService.countUserAccess(file.id, userId) > 0) {return null;}@@ -232,7 +239,7 @@ app.post('/user-create-key', (req, res) => {return;}- const fileAccessError = requireFileAccess(file, res.locals.user_id);+ const fileAccessError = requireFileOwner(file, res.locals.user_id);if (fileAccessError) {res.status(403);res.send(fileAccessError);@@ -266,7 +273,7 @@ app.post('/reset-user-file', async (req, res) => {return;}- const fileAccessError = requireFileAccess(file, res.locals.user_id);+ const fileAccessError = requireFileOwner(file, res.locals.user_id);if (fileAccessError) {res.status(403);res.send(fileAccessError);@@ -552,7 +559,7 @@ app.post('/delete-user-file', (req, res) => {return;}- const fileAccessError = requireFileAccess(file, res.locals.user_id);+ const fileAccessError = requireFileOwner(file, res.locals.user_id);if (fileAccessError) {res.status(403);res.send(fileAccessError);diff --git a/upcoming-release-notes/7977.md b/upcoming-release-notes/7977.mdnew file mode 100644index 0000000000..8b7d7c0759--- /dev/null+++ b/upcoming-release-notes/7977.md@@ -0,0 +1,6 @@+---+category: Bugfixes+authors: [MatissJanis]+---++Fixed a sync-server permission issue so only file owners or admins can perform sensitive file-management actions.