Security fixes pass #2

src/functions/server/web-pages/generate-web-html.tsx

@@ -178,16 +178,19 @@ export default async function genWebHTML({
     console.info = () => {};
     console.debug = () => {};
 
-    const stream = await renderToReadableStream(final_component, {
-        onError(error: any) {
-            if (error.message.includes('unique "key" prop')) return;
-            originalConsole.error(error);
-        },
-    });
+    let htmlBody: string;
+    try {
+        const stream = await renderToReadableStream(final_component, {
+            onError(error: any) {
+                if (error.message.includes('unique "key" prop')) return;
+                originalConsole.error(error);
+            },
+        });
 
-    const htmlBody = await new Response(stream).text();
-
-    Object.assign(console, originalConsole);
+        htmlBody = await new Response(stream).text();
+    } finally {
+        Object.assign(console, originalConsole);
+    }
 
     html += htmlBody;
 

src/functions/server/web-pages/grab-page-combined-server-res.ts

@@ -63,7 +63,7 @@ export default async function grabPageCombinedServerRes({
     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: BunextPageServerModule = final_page_server_path
         ? await import(`${final_page_server_path}?t=${now}`)

src/functions/server/web-pages/grab-page-component.tsx

@@ -117,7 +117,7 @@ export default async function grabPageComponent(
         }
 
         if (req && !is_hydration) {
-            global.BUNDLER_CTX_MAP[file_path].req = req;
+            global.BUNDLER_CTX_MAP[file_path].req_url = req.url;
         }
 
         if (debug) {