Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update URL sanitization for mobile app credential create flow (#2300)

Leendert de Borst014dbd4040ec
diff --git a/apps/mobile-app/app/(tabs)/items/add-edit.tsx b/apps/mobile-app/app/(tabs)/items/add-edit.tsx
index f71bd7348..05c974642 100644
--- a/apps/mobile-app/app/(tabs)/items/add-edit.tsx
+++ b/apps/mobile-app/app/(tabs)/items/add-edit.tsx
@@ -19,7 +19,7 @@ import emitter from '@/utils/EventEmitter';
import { HapticsUtility } from '@/utils/HapticsUtility';
import * as IdentityGenerator from '@/utils/IdentityGeneratorUtility';
import * as PasswordGenerator from '@/utils/PasswordGeneratorUtility';
-import { extractServiceNameFromUrl } from '@/utils/UrlUtility';
+import { extractServiceNameFromUrl, sanitizeServiceUrl } from '@/utils/UrlUtility';
import { useColors } from '@/hooks/useColorScheme';
import { useVaultMutate } from '@/hooks/useVaultMutate';
@@ -511,9 +511,9 @@ export default function AddEditItemScreen(): React.ReactNode {
let serviceName = '';
let decodedItemUrl = '';
- // Handle itemUrl param (URL passed from search or deep link)
+ // Handle itemUrl param (URL passed from search or deep link).
if (itemUrl) {
- decodedItemUrl = decodeURIComponent(itemUrl);
+ decodedItemUrl = sanitizeServiceUrl(decodeURIComponent(itemUrl));
serviceName = extractServiceNameFromUrl(decodedItemUrl);
}
diff --git a/apps/mobile-app/app/(tabs)/items/autofill-link-existing.tsx b/apps/mobile-app/app/(tabs)/items/autofill-link-existing.tsx
index ee5b8bf60..92a5a7ec6 100644
--- a/apps/mobile-app/app/(tabs)/items/autofill-link-existing.tsx
+++ b/apps/mobile-app/app/(tabs)/items/autofill-link-existing.tsx
@@ -13,6 +13,7 @@ import {
getFieldValue,
getFieldValues,
} from '@/utils/dist/core/models/vault';
+import { sanitizeServiceUrl } from '@/utils/UrlUtility';
import { useColors } from '@/hooks/useColorScheme';
import { useVaultMutate } from '@/hooks/useVaultMutate';
@@ -41,14 +42,15 @@ export default function AutofillLinkExistingScreen(): React.ReactNode {
const { showConfirm } = useDialog();
const { itemUrl } = useLocalSearchParams<{ itemUrl?: string }>();
+ // Handle itemUrl param (URL passed from search or deep link).
const decodedAppInfo = useMemo(() => {
if (!itemUrl) {
return '';
}
try {
- return decodeURIComponent(itemUrl);
+ return sanitizeServiceUrl(decodeURIComponent(itemUrl));
} catch {
- return itemUrl;
+ return sanitizeServiceUrl(itemUrl);
}
}, [itemUrl]);
diff --git a/apps/mobile-app/app/(tabs)/items/autofill-open-app.tsx b/apps/mobile-app/app/(tabs)/items/autofill-open-app.tsx
index c352294b3..6ae421a9a 100644
--- a/apps/mobile-app/app/(tabs)/items/autofill-open-app.tsx
+++ b/apps/mobile-app/app/(tabs)/items/autofill-open-app.tsx
@@ -4,6 +4,8 @@ import { useCallback, useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { AppState, StyleSheet, View } from 'react-native';
+import { sanitizeServiceUrl } from '@/utils/UrlUtility';
+
import { useColors } from '@/hooks/useColorScheme';
import { ThemedSafeAreaView } from '@/components/themed/ThemedSafeAreaView';
@@ -33,14 +35,15 @@ export default function AutofillOpenAppScreen(): React.ReactNode {
const { t } = useTranslation();
const { itemUrl } = useLocalSearchParams<{ itemUrl?: string }>();
+ // Handle itemUrl param (URL passed from search or deep link).
const decodedAppInfo = useMemo(() => {
if (!itemUrl) {
return '';
}
try {
- return decodeURIComponent(itemUrl);
+ return sanitizeServiceUrl(decodeURIComponent(itemUrl));
} catch {
- return itemUrl;
+ return sanitizeServiceUrl(itemUrl);
}
}, [itemUrl]);
diff --git a/apps/mobile-app/ios/Autofill/CredentialProviderViewController.swift b/apps/mobile-app/ios/Autofill/CredentialProviderViewController.swift
index 58ec0d34b..006326d16 100644
--- a/apps/mobile-app/ios/Autofill/CredentialProviderViewController.swift
+++ b/apps/mobile-app/ios/Autofill/CredentialProviderViewController.swift
@@ -320,7 +320,7 @@ public class CredentialProviderViewController: ASCredentialProviderViewControlle
override public func prepareCredentialList(for serviceIdentifiers: [ASCredentialServiceIdentifier]) {
let matchedDomains = serviceIdentifiers.map { $0.identifier.lowercased() }
if let firstDomain = matchedDomains.first {
- // Normalize URL to remove query parameters and trailing slashes
+ // Handle itemUrl param (URL passed from search or deep link).
let normalized = AutofillUrlNormalizer.normalize(firstDomain)
print("CredentialProviderViewController: First domain: \(firstDomain) → normalized: \(normalized)")
diff --git a/apps/mobile-app/ios/VaultUI/Selection/Utils/AutofillUrlNormalizer.swift b/apps/mobile-app/ios/VaultUI/Selection/Utils/AutofillUrlNormalizer.swift
index fc9f21c6b..9418d98ed 100644
--- a/apps/mobile-app/ios/VaultUI/Selection/Utils/AutofillUrlNormalizer.swift
+++ b/apps/mobile-app/ios/VaultUI/Selection/Utils/AutofillUrlNormalizer.swift
@@ -30,6 +30,7 @@ public enum AutofillUrlNormalizer {
guard var components = URLComponents(string: withScheme) else {
return withScheme
}
+ components.path = ""
components.query = nil
components.fragment = nil
let rebuilt = components.url?.absoluteString ?? withScheme
diff --git a/apps/mobile-app/utils/UrlUtility.ts b/apps/mobile-app/utils/UrlUtility.ts
index 705503d99..d58b0e36d 100644
--- a/apps/mobile-app/utils/UrlUtility.ts
+++ b/apps/mobile-app/utils/UrlUtility.ts
@@ -2,6 +2,27 @@
* Utility functions for handling service URLs and names
*/
+/**
+ * Reduce a service URL to its origin (scheme + host + port), dropping path, query and fragment.
+ * @param raw The raw URL, bare domain or app package identifier
+ * @returns The origin, or the input unchanged when there is no path to strip
+ */
+export function sanitizeServiceUrl(raw: string): string {
+ const trimmed = raw.trim();
+ if (!trimmed) {
+ return '';
+ }
+
+ const scheme = /^[a-z][a-z0-9+.-]*:\/\//i.exec(trimmed)?.[0] ?? '';
+ const authority = trimmed.slice(scheme.length).split(/[/?#]/)[0];
+
+ if (!authority) {
+ return trimmed;
+ }
+
+ return scheme + authority;
+}
+
/**
* Extract the service name from a service URL.
* @param url The service URL to extract the name from