Moduletrace/bunext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Security fixes pass #2

Browse Source
This commit is contained in:
tben
2026-04-19 16:00:59 +01:00
parent 3b26292124
commit b702e26bf6
40 changed files with 305 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/commands/start/index.js
Vendored
+12
View File
@@ -1,6 +1,9 @@
import { Command } from "commander";
import path from "path";
import writeErrorFile from "../../functions/write-error-file";
let retries = 0;
let timeout;
const MAX_RETRIES = 5;
export default function () {
return new Command("start")
.description("Start production server")
@@ -9,6 +12,11 @@ export default function () {
});
}
async function start() {
clearTimeout(timeout);
if (retries >= MAX_RETRIES) {
console.error(`Production server crashed ${MAX_RETRIES} times. Exiting.`);
process.exit(1);
}
const dev_spawn_file = path.resolve(__dirname, "prod-spawn.ts");
const spawn_options = {
cmd: ["bun", dev_spawn_file],
@@ -22,6 +30,10 @@ async function start() {
},
};
let dev_process = Bun.spawn(spawn_options);
retries++;
timeout = setTimeout(() => {
retries = 0;
}, 10000);
const exited = await dev_process.exited;
if (exited) {
return await start();
dist/functions/bundler/build-on-start-error-handler.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ export default async function buildOnstartErrorHandler(params) {
global.BUNDLER_CTX_DISPOSED = true;
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
Promise.all([
await Promise.all([
global.SSR_BUNDLER_CTX?.dispose(),
global.BUNDLER_CTX?.dispose(),
]);
dist/functions/bunext-init.d.ts
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
import type { BundlerCTXMap, BunextConfig, GlobalHMRControllerObject, PageFiles } from "../types";
import type { FileSystemRouter, Server } from "bun";
import grabDirNames from "../utils/grab-dir-names";
import { type DirNames } from "../utils/grab-dir-names";
import { type FSWatcher } from "fs";
import type { BuildContext } from "esbuild";
import grabConstants from "../utils/grab-constants";
@@ -31,7 +31,7 @@ declare global {
var SKIPPED_BROWSER_MODULES: Set<string>;
var BUNDLER_CTX: BuildContext | undefined;
var SSR_BUNDLER_CTX: BuildContext | undefined;
var DIR_NAMES: ReturnType<typeof grabDirNames>;
var DIR_NAMES: DirNames;
var REACT_IMPORTS_MAP: {
imports: Record<string, string>;
};
dist/functions/bunext-init.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
import grabDirNames from "../utils/grab-dir-names";
import grabDirNames, {} from "../utils/grab-dir-names";
import {} from "fs";
import init from "./init";
import isDevelopment from "../utils/is-development";
dist/functions/cache/trim-all-cache.js
Vendored
+4
View File
@@ -13,6 +13,10 @@ export default async function trimAllCache() {
const trim_key = await trimCacheKey({
key: cache_key,
});
if (trim_key.success) {
cached_items.splice(i, 1);
i--;
}
}
}
catch (error) {
dist/functions/server/bunext-req-handler.js
Vendored
+14 -3
View File
@@ -8,6 +8,8 @@ import handleBunextPublicAssets from "./handle-bunext-public-assets";
import checkExcludedPatterns from "../../utils/check-excluded-patterns";
import { AppData } from "../../data/app-data";
import fullRebuild from "./full-rebuild";
const HMR_RETRY_COOLDOWN_MS = 5000;
let lastHmrRetryTime = 0;
export default async function bunextRequestHandler({ req: initial_req, server, }) {
const is_dev = isDevelopment();
let req = initial_req.clone();
@@ -30,6 +32,11 @@ export default async function bunextRequestHandler({ req: initial_req, server, }
}
}
if (is_dev && url.pathname == AppData["BunextHMRRetryRoute"]) {
const now = Date.now();
if (now - lastHmrRetryTime < HMR_RETRY_COOLDOWN_MS) {
return new Response("Too Many Requests", { status: 429 });
}
lastHmrRetryTime = now;
await fullRebuild({ msg: `HMR Retry Rebuild ...` });
return new Response("Modules Rebuilt");
}
@@ -60,8 +67,12 @@ export default async function bunextRequestHandler({ req: initial_req, server, }
return response;
}
catch (error) {
return new Response(`Server Error: ${error.message}`, {
status: 500,
});
if (is_dev) {
return new Response(`Server Error: ${error.message}`, {
status: 500,
});
}
console.error(`Server Error: ${error.message}`, error);
return new Response("Internal Server Error", { status: 500 });
}
}
dist/functions/server/handle-bunext-public-assets.js
Vendored
+2 -1
View File
@@ -2,13 +2,14 @@ import grabDirNames from "../../utils/grab-dir-names";
import path from "path";
import isDevelopment from "../../utils/is-development";
import { readFileResponse } from "./handle-public";
import isSafePath from "../../utils/is-safe-path";
const { BUNEXT_PUBLIC_DIR } = grabDirNames();
export default async function ({ req }) {
try {
const is_dev = isDevelopment();
const url = new URL(req.url);
const file_path = path.join(BUNEXT_PUBLIC_DIR, url.pathname.replace(/\/\.bunext\/public\//, ""));
if (!file_path.startsWith(BUNEXT_PUBLIC_DIR + path.sep)) {
if (!isSafePath({ filePath: file_path, allowedDir: BUNEXT_PUBLIC_DIR })) {
return new Response("Forbidden", { status: 403 });
}
return readFileResponse({
dist/functions/server/handle-files.js
Vendored
+7 -2
View File
@@ -2,13 +2,14 @@ import grabDirNames from "../../utils/grab-dir-names";
import path from "path";
import isDevelopment from "../../utils/is-development";
import { existsSync } from "fs";
import isSafePath from "../../utils/is-safe-path";
const { PUBLIC_DIR } = grabDirNames();
export default async function ({ req }) {
try {
const is_dev = isDevelopment();
const url = new URL(req.url);
const file_path = path.join(PUBLIC_DIR, url.pathname);
if (!file_path.startsWith(PUBLIC_DIR + path.sep)) {
if (!isSafePath({ filePath: file_path, allowedDir: PUBLIC_DIR })) {
return new Response("Forbidden", { status: 403 });
}
if (!existsSync(file_path)) {
@@ -17,7 +18,11 @@ export default async function ({ req }) {
});
}
const file = Bun.file(file_path);
return new Response(file);
const headers = new Headers();
if (!is_dev) {
headers.set("Cache-Control", "public, max-age=3600");
}
return new Response(file, { headers });
}
catch (error) {
return new Response(`File Not Found`, {
dist/functions/server/handle-hmr.js
Vendored
+19 -6
View File
@@ -1,5 +1,21 @@
function removeController(controller) {
const idx = global.HMR_CONTROLLERS.findIndex((c) => c.controller == controller);
if (typeof idx == "number" && idx >= 0) {
global.HMR_CONTROLLERS.splice(idx, 1);
}
}
export default async function ({ req }) {
const referer_url = new URL(req.headers.get("referer") || "");
const referer = req.headers.get("referer");
if (!referer) {
return new Response("Missing Referer Header", { status: 400 });
}
let referer_url;
try {
referer_url = new URL(referer);
}
catch {
return new Response("Invalid Referer Header", { status: 400 });
}
const match = global.ROUTER.match(referer_url.pathname);
const target_map = match?.filePath
? global.BUNDLER_CTX_MAP?.[match.filePath]
@@ -20,16 +36,13 @@ export default async function ({ req }) {
}
catch {
clearInterval(heartbeat);
removeController(controller);
}
}, 5000);
},
cancel() {
clearInterval(heartbeat);
const targetControllerIndex = global.HMR_CONTROLLERS.findIndex((c) => c.controller == controller);
if (typeof targetControllerIndex == "number" &&
targetControllerIndex >= 0) {
global.HMR_CONTROLLERS.splice(targetControllerIndex, 1);
}
removeController(controller);
},
});
return new Response(stream, {
dist/functions/server/handle-public.js
Vendored
+5 -1
View File
@@ -2,13 +2,14 @@ import grabDirNames from "../../utils/grab-dir-names";
import path from "path";
import isDevelopment from "../../utils/is-development";
import { existsSync } from "fs";
import isSafePath from "../../utils/is-safe-path";
const { PUBLIC_DIR } = grabDirNames();
export default async function ({ req }) {
try {
const is_dev = isDevelopment();
const url = new URL(req.url);
const file_path = path.join(PUBLIC_DIR, url.pathname.replace(/^\/public/, ""));
if (!file_path.startsWith(PUBLIC_DIR + path.sep)) {
if (!isSafePath({ filePath: file_path, allowedDir: PUBLIC_DIR })) {
return new Response("Forbidden", { status: 403 });
}
return readFileResponse({ file_path });
@@ -33,6 +34,9 @@ export function readFileResponse({ file_path, cache }) {
else if (cache?.duration) {
headers.set("Cache-Control", `public, max-age=${cache.duration}`);
}
else if (!isDevelopment()) {
headers.set("Cache-Control", "public, max-age=3600");
}
return new Response(file, {
headers,
});
dist/functions/server/handle-routes.js
Vendored
+19 -3
View File
@@ -41,12 +41,13 @@ export default async function ({ req }) {
module = await import(import_path);
}
const config = module.config;
const maxBodyBytes = config?.max_request_body_mb
? config.max_request_body_mb * MBInBytes
: ServerDefaultRequestBodyLimitBytes;
const contentLength = req.headers.get("content-length");
if (contentLength) {
const size = parseInt(contentLength, 10);
if ((config?.max_request_body_mb &&
size > config.max_request_body_mb * MBInBytes) ||
size > ServerDefaultRequestBodyLimitBytes) {
if (size > maxBodyBytes) {
return Response.json({
success: false,
msg: "Request Body Too Large!",
@@ -58,6 +59,21 @@ export default async function ({ req }) {
});
}
}
else if (req.method !== "GET" && req.method !== "HEAD") {
const body = await req.arrayBuffer();
if (body.byteLength > maxBodyBytes) {
return Response.json({
success: false,
msg: "Request Body Too Large!",
}, {
status: 413,
headers: {
"Content-Type": "application/json",
},
});
}
routeParams.body = JSON.parse(new TextDecoder().decode(body) || "{}");
}
const target_module = (module["default"] ||
module["handler"]);
const res = await target_module?.({
dist/functions/server/server-post-build-fn.js
Vendored
+2 -2
View File
@@ -30,8 +30,8 @@ export default async function serverPostBuildFn(params) {
controller.controller.enqueue(reload_enqueue);
continue;
}
const mock_req = target_artifact.req
? target_artifact.req.clone()
const mock_req = target_artifact.req_url
? new Request(target_artifact.req_url)
: new Request(controller.page_url);
const page_component = global.IS_SERVER_COMPONENT
? await grabPageComponent({
dist/functions/server/web-pages/generate-web-html.js
Vendored
+14 -9
View File
@@ -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;
}
dist/functions/server/web-pages/grab-page-combined-server-res.js
Vendored
+1 -1
View File
@@ -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;
dist/functions/server/web-pages/grab-page-component.js
Vendored
+1 -1
View File
@@ -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);
dist/types/index.d.ts
Vendored
+1 -1
View File
@@ -306,7 +306,7 @@ export type BundlerCTXMap = {
url_path: string;
file_name: string;
css_path?: string;
req?: Request;
req_url?: string;
};
export type GlobalHMRControllerObject = {
controller: ReadableStreamDefaultController<string>;
dist/utils/deserialize-query.d.ts
Vendored
-3
View File
@@ -1,6 +1,3 @@
/**
* # Convert Serialized Query back to object
*/
export default function deserializeQuery(query: string | {
[s: string]: any;
}): {
dist/utils/deserialize-query.js
Vendored
+20 -5
View File
@@ -1,18 +1,33 @@
import EJSON from "./ejson";
/**
* # Convert Serialized Query back to object
*/
const DANGEROUS_KEYS = new Set(["__proto__", "constructor", "prototype"]);
function sanitize(value) {
if (value === null || typeof value !== "object")
return value;
if (Array.isArray(value))
return value.map(sanitize);
const clean = Object.create(null);
for (const key of Object.keys(value)) {
if (DANGEROUS_KEYS.has(key))
continue;
clean[key] = sanitize(value[key]);
}
return clean;
}
export default function deserializeQuery(query) {
let queryObject = typeof query == "object" ? query : Object(EJSON.parse(query));
const keys = Object.keys(queryObject);
for (let i = 0; i < keys.length; i++) {
const key = keys[i];
const value = queryObject[key];
if (DANGEROUS_KEYS.has(key)) {
delete queryObject[key];
continue;
}
if (typeof value == "string") {
if (value.match(/^\{|^\[/)) {
queryObject[key] = EJSON.parse(value);
queryObject[key] = sanitize(EJSON.parse(value));
}
}
}
return queryObject;
return sanitize(queryObject);
}
dist/utils/grab-dir-names.d.ts
Vendored
+2 -1
View File
@@ -1,4 +1,4 @@
export default function grabDirNames(): {
export type DirNames = {
ROOT_DIR: string;
SRC_DIR: string;
PAGES_DIR: string;
@@ -27,3 +27,4 @@ export default function grabDirNames(): {
BUNX_ERROR_LOGS_DIR: string;
BUNX_LOGS_DIR: string;
};
export default function grabDirNames(): DirNames;
dist/utils/grab-dir-names.js
Vendored
+2
View File
@@ -1,5 +1,7 @@
import path from "path";
export default function grabDirNames() {
if (global.DIR_NAMES)
return global.DIR_NAMES;
const ROOT_DIR = process.cwd();
const SRC_DIR = path.join(ROOT_DIR, "src");
const PAGES_DIR = path.join(SRC_DIR, "pages");
dist/utils/is-development.js
Vendored
+2 -6
View File
@@ -1,10 +1,6 @@
export default function isDevelopment() {
const config = global.CONFIG;
if (process.env.NODE_ENV == "production") {
if (process.env.NODE_ENV === "production") {
return false;
}
if (config.development) {
return true;
}
return false;
return Boolean(global.CONFIG?.development);
}
dist/utils/is-safe-path.d.ts
Vendored
+4
View File
@@ -0,0 +1,4 @@
export default function isSafePath({ filePath, allowedDir, }: {
filePath: string;
allowedDir: string;
}): boolean;
dist/utils/is-safe-path.js
Vendored
+15
View File
@@ -0,0 +1,15 @@
import { realpathSync } from "fs";
import path from "path";
export default function isSafePath({ filePath, allowedDir, }) {
const resolved = path.resolve(filePath);
if (!resolved.startsWith(allowedDir + path.sep) && resolved !== allowedDir) {
return false;
}
try {
const real = realpathSync(resolved);
return (real.startsWith(allowedDir + path.sep) || real === allowedDir);
}
catch {
return false;
}
}