fix: Introduce proper error for invalid URL

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

_locales/en/messages.json

@@ -134,6 +134,9 @@
   "Error045": {
     "message": "E045: Unexpected folder path. The local sync folder for this profile used to be at `{0}` but is now at `{1}`. Please make sure this is intended and set the local sync folder again in the profile settings."
   },
+  "Error046": {
+    "message": "E046: Invalid URL. `{0}` is not a valid URL."
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },

src/errors/Error.ts

@@ -392,4 +392,15 @@ export class UnexpectedFolderPathError extends FloccusError {
     this.newPath = newPath
     Object.setPrototypeOf(this, UnexpectedFolderPathError.prototype)
   }
+}
+
+export class InvalidUrlError extends FloccusError {
+  public url: string
+
+  constructor(url: string) {
+    super(`E046: Invalid URL. '${url}' is not a valid URL.`)
+    this.code = 46
+    this.url = url
+    Object.setPrototypeOf(this, InvalidUrlError.prototype)
+  }
 }

src/lib/adapters/NextcloudBookmarks.ts

@@ -28,7 +28,7 @@ import {
   UnknownCreateTargetError,
   UnknownFolderParentUpdateError,
   UnknownFolderUpdateError,
-  UnknownMoveTargetError, UpdateBookmarkError
+  UnknownMoveTargetError, UpdateBookmarkError, InvalidUrlError
 } from '../../errors/Error'
 
 const PAGE_SIZE = 300
@@ -122,7 +122,12 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
   }
 
   normalizeServerURL(input:string):string {
-    const serverURL = new URL(input)
+    let serverURL
+    try {
+      serverURL = new URL(input)
+    } catch (e) {
+      throw new InvalidUrlError(input)
+    }
     const indexLoc = serverURL.pathname.indexOf('index.php')
     if (!serverURL.pathname) serverURL.pathname = ''
     serverURL.search = ''

src/lib/adapters/WebDav.ts

@@ -10,7 +10,7 @@ import {
   HttpError, CancelledSyncError,
   LockFileError, MissingPermissionsError,
   NetworkError, RedirectError, ResourceLockedError,
-  SlashError, FileSizeMismatch, FileSizeUnknown
+  SlashError, FileSizeMismatch, FileSizeUnknown, InvalidUrlError
 } from '../../errors/Error'
 import { CapacitorHttp as Http } from '@capacitor/core'
 import { Capacitor } from '@capacitor/core'
@@ -56,7 +56,12 @@ export default class WebDavAdapter extends CachingAdapter {
   }
 
   normalizeServerURL(input) {
-    const serverURL = new URL(input)
+    let serverURL
+    try {
+      serverURL = new URL(input)
+    } catch (e) {
+      throw new InvalidUrlError(input)
+    }
     if (!serverURL.pathname) serverURL.pathname = ''
     serverURL.search = ''
     serverURL.hash = ''

src/lib/browser/BrowserAccount.ts

@@ -8,7 +8,7 @@ import {
   CreateBookmarkError,
   DeletionFailsafeError, FloccusError, GitPushError,
   HttpError,
-  InconsistentBookmarksExistenceError, LockFileError,
+  InconsistentBookmarksExistenceError, InvalidUrlError, LockFileError,
   MissingItemOrderError,
   ParseResponseError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
@@ -126,6 +126,9 @@ export default class BrowserAccount extends Account {
     if (er instanceof UnexpectedFolderPathError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.originalPath, er.newPath])
     }
+    if (er instanceof InvalidUrlError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.url])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }

src/lib/native/NativeAccount.ts

@@ -8,7 +8,7 @@ import {
   CreateBookmarkError,
   DeletionFailsafeError, FloccusError, GitPushError,
   HttpError,
-  InconsistentBookmarksExistenceError, LockFileError,
+  InconsistentBookmarksExistenceError, InvalidUrlError, LockFileError,
   MissingItemOrderError,
   ParseResponseError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
@@ -103,6 +103,9 @@ export default class NativeAccount extends Account {
     if (er instanceof UnexpectedFolderPathError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.originalPath, er.newPath])
     }
+    if (er instanceof InvalidUrlError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.url])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }