Skip to content

A local-first personal finance app

🐛 Sync server - resolving the user-files and server-files to an absolute dir (#4954)

Michael Clarkb0adcb1333e6
diff --git a/packages/sync-server/bin/actual-server.js b/packages/sync-server/bin/actual-server.js
index 5d21b64ab5..003db740ec 100755
--- a/packages/sync-server/bin/actual-server.js
+++ b/packages/sync-server/bin/actual-server.js
@@ -71,12 +71,12 @@ const setupDataDir = (dataDir = undefined) => {
if (existsSync('./data')) {
// The default data directory exists - use it
console.info('Found existing data directory');
- process.env.ACTUAL_DATA_DIR = './data';
+ process.env.ACTUAL_DATA_DIR = resolve('./data');
} else {
console.info(
'Using default data directory. You can specify a custom config with --config',
);
- process.env.ACTUAL_DATA_DIR = './';
+ process.env.ACTUAL_DATA_DIR = resolve('./');
}
console.info(`Data directory: ${process.env.ACTUAL_DATA_DIR}`);
diff --git a/packages/sync-server/src/account-db.js b/packages/sync-server/src/account-db.js
index cbb43a0ded..4c36287fb7 100644
--- a/packages/sync-server/src/account-db.js
+++ b/packages/sync-server/src/account-db.js
@@ -1,4 +1,4 @@
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
import * as bcrypt from 'bcrypt';
@@ -11,7 +11,7 @@ let _accountDb;
export function getAccountDb() {
if (_accountDb === undefined) {
- const dbPath = join(config.get('serverFiles'), 'account.sqlite');
+ const dbPath = join(resolve(config.get('serverFiles')), 'account.sqlite');
_accountDb = openDatabase(dbPath);
}
diff --git a/packages/sync-server/src/util/paths.js b/packages/sync-server/src/util/paths.js
index 47cdf4faf7..5d3567c3c6 100644
--- a/packages/sync-server/src/util/paths.js
+++ b/packages/sync-server/src/util/paths.js
@@ -1,13 +1,13 @@
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
import { config } from '../load-config.js';
/** @param {string} fileId */
export function getPathForUserFile(fileId) {
- return join(config.get('userFiles'), `file-${fileId}.blob`);
+ return join(resolve(config.get('userFiles')), `file-${fileId}.blob`);
}
/** @param {string} groupId */
export function getPathForGroupFile(groupId) {
- return join(config.get('userFiles'), `group-${groupId}.sqlite`);
+ return join(resolve(config.get('userFiles')), `group-${groupId}.sqlite`);
}
diff --git a/upcoming-release-notes/4954.md b/upcoming-release-notes/4954.md
new file mode 100644
index 0000000000..37590b48fc
--- /dev/null
+++ b/upcoming-release-notes/4954.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MikesGlitch]
+---
+
+Ensure sync server uses absolute directories so users can configure relative paths for user-files