Skip to content

Commit e5de4cf

Browse files
juliusmarmingecodex
andcommitted
Fix legal modal navigation safeguards
Co-authored-by: codex <[email protected]>
1 parent bb8dd73 commit e5de4cf

5 files changed

Lines changed: 83 additions & 52 deletions

File tree

‎apps/mobile/src/Stack.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ const WORKSPACE_OVERLAY_ROUTES = new Set([
252252
"GitConfirm",
253253
"GitOverview",
254254
"NewTaskSheet",
255+
"SettingsLegal",
255256
"SettingsSheet",
256257
"ThreadReviewComment",
257258
]);
Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
import { SettingsLegalDocumentRouteScreen } from "./components/SettingsLegalDocumentRouteScreen";
2-
import {
3-
LEGAL_URL,
4-
PRIVACY_POLICY_URL,
5-
SECURITY_POLICY_URL,
6-
TERMS_OF_SERVICE_URL,
7-
} from "./lib/legal-document-url";
8-
9-
const ALLOWED_LEGAL_DOCUMENT_URLS = [
10-
LEGAL_URL,
11-
PRIVACY_POLICY_URL,
12-
TERMS_OF_SERVICE_URL,
13-
SECURITY_POLICY_URL,
14-
] as const;
2+
import { LEGAL_URL } from "./lib/legal-document-url";
153

164
export function SettingsLegalRouteScreen() {
17-
return (
18-
<SettingsLegalDocumentRouteScreen
19-
allowedDocumentUrls={ALLOWED_LEGAL_DOCUMENT_URLS}
20-
documentName="Legal"
21-
documentUrl={LEGAL_URL}
22-
/>
23-
);
5+
return <SettingsLegalDocumentRouteScreen documentName="Legal" documentUrl={LEGAL_URL} />;
246
}

‎apps/mobile/src/features/settings/components/SettingsLegalDocumentRouteScreen.tsx‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1-
import { useNavigation } from "@react-navigation/native";
2-
import { useCallback, useRef, useState } from "react";
1+
import {
2+
type NavigationProp,
3+
type ParamListBase,
4+
type RouteProp,
5+
useNavigation,
6+
useRoute,
7+
} from "@react-navigation/native";
8+
import { useCallback, useState } from "react";
39
import { ActivityIndicator, Linking, Pressable, View } from "react-native";
410
import { WebView } from "react-native-webview";
511

612
import { AppText as Text } from "../../../components/AppText";
713
import { LoadingStrip } from "../../../components/LoadingStrip";
814
import { SymbolView } from "../../../components/AppSymbol";
915
import { useThemeColor } from "../../../lib/useThemeColor";
10-
import { LEGAL_URL } from "../lib/legal-document-url";
16+
import { isLegalDocumentUrl, LEGAL_URL } from "../lib/legal-document-url";
17+
18+
type SettingsLegalRouteParams = {
19+
SettingsLegal: { readonly externalUrl?: string } | undefined;
20+
};
1121

1222
export function SettingsLegalDocumentCloseHeaderButton() {
1323
const navigation = useNavigation();
@@ -34,13 +44,18 @@ export function SettingsLegalDocumentCloseHeaderButton() {
3444

3545
export function SettingsLegalDocumentExternalHeaderButton() {
3646
const iconColor = useThemeColor("--color-icon");
47+
const route = useRoute<RouteProp<SettingsLegalRouteParams, "SettingsLegal">>();
48+
const externalUrl =
49+
route.params?.externalUrl && isLegalDocumentUrl(route.params.externalUrl)
50+
? route.params.externalUrl
51+
: LEGAL_URL;
3752

3853
return (
3954
<Pressable
4055
accessibilityLabel="Open legal documents in external browser"
4156
accessibilityRole="button"
4257
hitSlop={12}
43-
onPress={() => void Linking.openURL(LEGAL_URL).catch(() => undefined)}
58+
onPress={() => void Linking.openURL(externalUrl).catch(() => undefined)}
4459
className="p-2 active:opacity-60"
4560
>
4661
<SymbolView
@@ -54,34 +69,17 @@ export function SettingsLegalDocumentExternalHeaderButton() {
5469
);
5570
}
5671

57-
function webDocumentIdentity(value: string): string | null {
58-
try {
59-
const url = new URL(value);
60-
if (url.protocol !== "https:" && url.protocol !== "http:") return null;
61-
62-
const pathname = url.pathname.replace(/\/+$/, "") || "/";
63-
return `${url.origin}${pathname}`;
64-
} catch {
65-
return null;
66-
}
67-
}
68-
6972
interface SettingsLegalDocumentRouteScreenProps {
7073
readonly documentName: string;
7174
readonly documentUrl: string;
72-
readonly allowedDocumentUrls: readonly string[];
7375
}
7476

7577
export function SettingsLegalDocumentRouteScreen({
7678
documentName,
7779
documentUrl,
78-
allowedDocumentUrls,
7980
}: SettingsLegalDocumentRouteScreenProps) {
81+
const navigation = useNavigation<NavigationProp<ParamListBase>>();
8082
const iconColor = useThemeColor("--color-icon");
81-
const allowedDocumentIdentities = new Set(
82-
allowedDocumentUrls.map(webDocumentIdentity).filter((value): value is string => value !== null),
83-
);
84-
const isInitialLoadRef = useRef(true);
8583
const [reloadKey, setReloadKey] = useState(0);
8684
const [loadProgress, setLoadProgress] = useState(0);
8785
const [loadError, setLoadError] = useState<string | null>(null);
@@ -111,7 +109,6 @@ export function SettingsLegalDocumentRouteScreen({
111109
<Pressable
112110
accessibilityRole="button"
113111
onPress={() => {
114-
isInitialLoadRef.current = true;
115112
setLoadError(null);
116113
setReloadKey((value) => value + 1);
117114
}}
@@ -149,11 +146,7 @@ export function SettingsLegalDocumentRouteScreen({
149146
thirdPartyCookiesEnabled={false}
150147
startInLoadingState
151148
onShouldStartLoadWithRequest={(request) => {
152-
const requestIdentity = webDocumentIdentity(request.url);
153-
const isConfiguredDocument =
154-
requestIdentity !== null && allowedDocumentIdentities.has(requestIdentity);
155-
const isInitialRedirect = isInitialLoadRef.current && request.navigationType === "other";
156-
if (isConfiguredDocument || isInitialRedirect) return true;
149+
if (isLegalDocumentUrl(request.url)) return true;
157150

158151
openExternalUrl(request.url);
159152
return false;
@@ -165,17 +158,18 @@ export function SettingsLegalDocumentRouteScreen({
165158
setLoadProgress(0.05);
166159
setLoadError(null);
167160
}}
168-
onLoadEnd={() => {
169-
isInitialLoadRef.current = false;
161+
onLoadEnd={(event) => {
162+
if (isLegalDocumentUrl(event.nativeEvent.url)) {
163+
navigation.setParams({ externalUrl: event.nativeEvent.url });
164+
}
170165
setLoadProgress(0);
171166
}}
172167
onError={(event) => {
173-
isInitialLoadRef.current = false;
174168
setLoadProgress(0);
175169
setLoadError(event.nativeEvent.description || "The page could not be loaded.");
176170
}}
177171
onHttpError={(event) => {
178-
isInitialLoadRef.current = false;
172+
if (!isLegalDocumentUrl(event.nativeEvent.url)) return;
179173
setLoadProgress(0);
180174
setLoadError(`The server returned status ${event.nativeEvent.statusCode}.`);
181175
}}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import { isLegalDocumentUrl } from "./legal-document-url";
4+
5+
describe("isLegalDocumentUrl", () => {
6+
it.each([
7+
"https://t3.codes/legal",
8+
"https://t3.codes/legal/",
9+
"https://t3.codes/privacy-policy?source=app",
10+
"https://t3.codes/terms-of-service#updates",
11+
"https://t3.codes/security-policy",
12+
])("allows a configured legal document: %s", (url) => {
13+
expect(isLegalDocumentUrl(url)).toBe(true);
14+
});
15+
16+
it.each([
17+
"https://t3.codes/download",
18+
"https://example.com/legal",
19+
"javascript:alert(1)",
20+
"not-a-url",
21+
])("rejects a URL outside the legal-document allowlist: %s", (url) => {
22+
expect(isLegalDocumentUrl(url)).toBe(false);
23+
});
24+
});

‎apps/mobile/src/features/settings/lib/legal-document-url.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,33 @@ export const PRIVACY_POLICY_URL = marketingSiteDocumentUrl("privacy-policy");
2626
export const SECURITY_POLICY_URL = marketingSiteDocumentUrl("security-policy");
2727
export const TERMS_OF_SERVICE_URL = marketingSiteDocumentUrl("terms-of-service");
2828
export const LEGAL_URL = marketingSiteDocumentUrl("legal");
29+
30+
export const ALLOWED_LEGAL_DOCUMENT_URLS = [
31+
LEGAL_URL,
32+
PRIVACY_POLICY_URL,
33+
TERMS_OF_SERVICE_URL,
34+
SECURITY_POLICY_URL,
35+
] as const;
36+
37+
function webDocumentIdentity(value: string): string | null {
38+
try {
39+
const url = new URL(value);
40+
if (url.protocol !== "https:" && url.protocol !== "http:") return null;
41+
42+
const pathname = url.pathname.replace(/\/+$/, "") || "/";
43+
return `${url.origin}${pathname}`;
44+
} catch {
45+
return null;
46+
}
47+
}
48+
49+
const ALLOWED_LEGAL_DOCUMENT_IDENTITIES = new Set(
50+
ALLOWED_LEGAL_DOCUMENT_URLS.map(webDocumentIdentity).filter(
51+
(value): value is string => value !== null,
52+
),
53+
);
54+
55+
export function isLegalDocumentUrl(value: string): boolean {
56+
const identity = webDocumentIdentity(value);
57+
return identity !== null && ALLOWED_LEGAL_DOCUMENT_IDENTITIES.has(identity);
58+
}

0 commit comments

Comments
 (0)