ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
harden(auth): close three gaps in the post-login redirect validator
Juan Denis8000faad0b6e
diff --git a/frontend/src/utils/__tests__/redirectAfterLogin.test.mjs b/frontend/src/utils/__tests__/redirectAfterLogin.test.mjsindex 8de93625..41e5e72c 100644Binary files a/frontend/src/utils/__tests__/redirectAfterLogin.test.mjs and b/frontend/src/utils/__tests__/redirectAfterLogin.test.mjs differdiff --git a/frontend/src/utils/redirectAfterLogin.js b/frontend/src/utils/redirectAfterLogin.jsindex c4cd7ceb..79e7910a 100644--- a/frontend/src/utils/redirectAfterLogin.js+++ b/frontend/src/utils/redirectAfterLogin.js@@ -15,8 +15,17 @@const STORAGE_KEY = 'serverkit.redirectAfterLogin';+// How long a parked destination stays good. Long enough to cover a password+// manager, a TOTP prompt, or an SSO round trip that includes signing up at the+// provider; short enough that a destination abandoned earlier in the tab+// session does not resurface on an unrelated login and read as a glitch.+const MAX_AGE_MS = 30 * 60 * 1000;++// A path far longer than any real panel route is not a destination.+const MAX_PATH_LENGTH = 2048;+// Landing back on one of these after login is either a loop or nonsense.-const AUTH_PATHS = ['/login', '/register', '/setup', '/migrate', '/logout'];+const AUTH_PATH_PREFIXES = ['/login', '/register', '/setup', '/migrate', '/logout'];/*** Validate a stored destination before we navigate to it.@@ -28,6 +37,7 @@ const AUTH_PATHS = ['/login', '/register', '/setup', '/migrate', '/logout'];*/export function sanitizeRedirect(path) {if (typeof path !== 'string' || !path) return null;+ if (path.length > MAX_PATH_LENGTH) return null;if (path[0] !== '/') return null;if (path[1] === '/' || path[1] === '\\') return null;// Control characters (newline, tab, NUL) can smuggle a value past the@@ -36,7 +46,23 @@ export function sanitizeRedirect(path) {if (/[\u0000-\u001f\u007f]/.test(path)) return null;const pathname = path.split(/[?#]/)[0];- if (AUTH_PATHS.includes(pathname)) return null;++ // Dot segments, plain or percent-encoded, in any position. They collapse:+ // `/..//evil.com` normalizes to `//evil.com`, which is only same-origin+ // while it is resolved against a base — hand that same string to+ // `window.location.href` and it leaves the site. Nothing in this app needs+ // a dot segment, so refuse the gadget rather than reason about every+ // consumer of the value.+ if (pathname.split('/').some((segment) => segment === '.' || segment === '..')) return null;+ if (/%2e/i.test(pathname)) return null;++ // Prefix match with a "/" boundary, case-insensitive: catches /login/ and+ // /login/callback/<provider> (which would re-run the SSO callback with no+ // code and show an error), while leaving /logins and /login-help valid.+ const lowered = pathname.toLowerCase();+ if (AUTH_PATH_PREFIXES.some((p) => lowered === p || lowered.startsWith(`${p}/`))) {+ return null;+ }return path;}@@ -49,7 +75,7 @@ export function rememberRedirect(location) {);if (!path || path === '/') return; // the dashboard is already the defaulttry {- window.sessionStorage.setItem(STORAGE_KEY, path);+ window.sessionStorage.setItem(STORAGE_KEY, JSON.stringify({ path, at: Date.now() }));} catch {// Storage unavailable — fall back to the dashboard, as before.}@@ -61,12 +87,30 @@ export function rememberRedirect(location) {* post-login navigation is not the place to trust that assumption.*/export function consumeRedirect() {- let stored = null;+ let raw = null;try {- stored = window.sessionStorage.getItem(STORAGE_KEY);+ raw = window.sessionStorage.getItem(STORAGE_KEY);window.sessionStorage.removeItem(STORAGE_KEY);} catch {return '/';}- return sanitizeRedirect(stored) || '/';+ if (!raw) return '/';++ let stored;+ try {+ stored = JSON.parse(raw);+ } catch {+ return '/';+ }+ if (!stored || typeof stored !== 'object') return '/';++ // A missing, non-numeric, or future timestamp is treated as expired rather+ // than trusted: rememberRedirect is the only writer, so anything else is+ // not a value this module put there.+ const at = Number(stored.at);+ if (!Number.isFinite(at) || at > Date.now() || Date.now() - at > MAX_AGE_MS) {+ return '/';+ }++ return sanitizeRedirect(stored.path) || '/';}