Security fixes pass #2

2026-04-19 16:00:59 +01:00
parent 3b26292124
commit b702e26bf6
40 changed files with 305 additions and 93 deletions
@@ -76,15 +76,20 @@ export default async function genWebHTML({ component: Main, pageProps, bundledMa
    console.error = () => { };
    console.info = () => { };
    console.debug = () => { };
-    const stream = await renderToReadableStream(final_component, {
-        onError(error) {
-            if (error.message.includes('unique "key" prop'))
-                return;
-            originalConsole.error(error);
-        },
-    });
-    const htmlBody = await new Response(stream).text();
-    Object.assign(console, originalConsole);
+    let htmlBody;
+    try {
+        const stream = await renderToReadableStream(final_component, {
+            onError(error) {
+                if (error.message.includes('unique "key" prop'))
+                    return;
+                originalConsole.error(error);
+            },
+        });
+        htmlBody = await new Response(stream).text();
+    }
+    finally {
+        Object.assign(console, originalConsole);
+    }
    html += htmlBody;
    return html;
 }
@@ -33,7 +33,7 @@ export default async function grabPageCombinedServerRes({ file_path, debug, url,
    const page_server_ctx = global.SSR_BUNDLER_CTX_MAP[server_file_path || ""];
    const final_page_server_path = page_server_ctx?.local_path
        ? path.join(ROOT_DIR, page_server_ctx.path)
-        : root_server_file_path;
+        : server_file_path;
    const server_module = final_page_server_path
        ? await import(`${final_page_server_path}?t=${now}`)
        : undefined;
@@ -72,7 +72,7 @@ export default async function grabPageComponent(params) {
            }
        }
        if (req && !is_hydration) {
-            global.BUNDLER_CTX_MAP[file_path].req = req;
+            global.BUNDLER_CTX_MAP[file_path].req_url = req.url;
        }
        if (debug) {
            log.info(`bundledMap:`, bundledMap);