A local-first personal finance app
🐛 Fix validation issue for invalid server URLs in /config-server page (#3837)
Sai Hemanth Beerakadad702e5c2a3
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsxindex d8c1727e04..44b13d2e61 100644--- a/packages/desktop-client/src/components/manager/ConfigServer.tsx+++ b/packages/desktop-client/src/components/manager/ConfigServer.tsx@@ -63,23 +63,16 @@ export function ConfigServer() {setError(null);setLoading(true);- const { error } = await setServerUrl(url);- if (- ['network-failure', 'get-server-failure'].includes(error) &&- !url.startsWith('http://') &&- !url.startsWith('https://')- ) {- const { error } = await setServerUrl('https://' + url);- if (error) {- setUrl('https://' + url);- setError(error);- } else {- await signOut();- navigate('/');- }- setLoading(false);- } else if (error) {+ let httpUrl = url;+ if (!url.startsWith('http://') && !url.startsWith('https://')) {+ httpUrl = 'https://' + url;+ }++ const { error } = await setServerUrl(httpUrl);+ setUrl(httpUrl);++ if (error) {setLoading(false);setError(error);} else {diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.tsindex a4965372f6..d2801148e4 100644--- a/packages/loot-core/src/server/main.ts+++ b/packages/loot-core/src/server/main.ts@@ -56,7 +56,7 @@ import * as prefs from './prefs';import { app as reportsApp } from './reports/app';import { app as rulesApp } from './rules/app';import { app as schedulesApp } from './schedules/app';-import { getServer, setServer } from './server-config';+import { getServer, isValidBaseURL, setServer } from './server-config';import * as sheet from './sheet';import { resolveName, unresolveName } from './spreadsheet/util';import {@@ -1513,6 +1513,10 @@ handlers['get-did-bootstrap'] = async function () {handlers['subscribe-needs-bootstrap'] = async function ({url,}: { url? } = {}) {+ if (url && !isValidBaseURL(url)) {+ return { error: 'get-server-failure' };+ }+try {if (!getServer(url)) {return { bootstrapped: true, hasServer: false };diff --git a/packages/loot-core/src/server/server-config.ts b/packages/loot-core/src/server/server-config.tsindex b0e1432d21..ddef5636a4 100644--- a/packages/loot-core/src/server/server-config.ts+++ b/packages/loot-core/src/server/server-config.ts@@ -16,6 +16,14 @@ function joinURL(base: string | URL, ...paths: string[]): string {return url.toString();}+export function isValidBaseURL(base: string): boolean {+ try {+ return Boolean(new URL(base));+ } catch (error) {+ return false;+ }+}+export function setServer(url: string): void {if (url == null) {config = null;diff --git a/upcoming-release-notes/3837.md b/upcoming-release-notes/3837.mdnew file mode 100644index 0000000000..45e9c109ab--- /dev/null+++ b/upcoming-release-notes/3837.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [shb9019]+---++Fix validation issue for invalid server URLs in /config-server page