Skip to content

Open-source status page, incident response and uptime monitoring

chore: improve callback url (#1981)

Maximilian Kaskebe4c8e4e9430
diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
index 8488c49be..bf83003c2 100644
--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
@@ -130,20 +130,16 @@ export function Client() {
useEffect(() => {
if (!callbackUrl) return;
- // Ignore base URL redirects - only redirect for meaningful paths (e.g., /invite?token=...)
+ // Validate and normalize the callbackUrl to prevent XSS via javascript: or other dangerous schemes
try {
const url = new URL(callbackUrl, window.location.origin);
if (url.pathname === "/" || url.pathname === "") return;
- // Only allow same-origin redirects with safe protocols
if (url.origin !== window.location.origin) return;
if (url.protocol !== "http:" && url.protocol !== "https:") return;
- router.push(callbackUrl);
+ // Navigate using the parsed URL to avoid raw-input parsing discrepancies
+ router.push(`${url.pathname}${url.search}${url.hash}`);
} catch {
- // If callbackUrl is a relative path, check it directly
- if (callbackUrl === "/" || callbackUrl === "") return;
- // Only allow paths starting with / to prevent protocol-based attacks
- if (!callbackUrl.startsWith("/")) return;
- router.push(callbackUrl);
+ // Malformed URLs are not safe to navigate to
}
}, [callbackUrl, router]);
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(auth)/login/_components/section-password.tsx b/apps/status-page/src/app/(status-page)/[domain]/(auth)/login/_components/section-password.tsx
index e42c6ce54..bc8d574ae 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(auth)/login/_components/section-password.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(auth)/login/_components/section-password.tsx
@@ -43,7 +43,12 @@ export function SectionPassword() {
if (result) {
setPassword(values.password);
const redirect = searchParams.get("redirect");
- router.push(redirect ?? "/");
+ // Only allow safe relative paths to prevent XSS via javascript: URLs
+ if (redirect?.startsWith("/") && !redirect.startsWith("//")) {
+ router.push(redirect);
+ } else {
+ router.push("/");
+ }
}
}}
/>