fix(authz): fix prod boot-order (C1), dev HMR staleness (I2), add prod coverage (I4)

Fix round 2 for Task 14, addressing a critical review finding reproduced on
a real built server.

C1 (critical): the generated production entry set the authz catalog inside
createProductionServer's BODY, but ES modules evaluate every static import
(including app middleware, emitted as a static import) before the importing
module's body runs. Middleware reading getAuthzCatalog() at module scope —
the same eager shape authzMiddleware({ catalog, ... }) itself requires, and
the pattern app/middleware/logger.ts's `export default requestLogger({...})`
already uses — saw an unset catalog and crashed the whole process at import
time, after every other gate (typecheck/lint/tests/a plain `bun run build`)
stayed green.

Fix: packages/cli/src/build.ts now emits a small side-effecting
`.authz-setup.ts` module containing the static imports of every
app/authz/*.ts declaration plus a call to the new
applyAuthzManifestEarly(entries) (packages/dev-server/src/prod.ts), and
imports THAT MODULE FIRST in the generated entry — before pages, api,
realtime, middleware, components, and layouts. applyAuthzManifestEarly is
deliberately silent (no missing-default-export warnings, though a genuine
conflict still throws and fails the boot at import time); createProductionHandlers
keeps its own unconditional merge+set as an idempotent, always-warning second
pass, so an adapter that bypasses the generated entry and calls it directly
still gets a correctly merged, validated catalog, and so the function stays
independently testable.

I3: corrected packages/authz/src/client.ts's WRN-AUTHZ-SETUP message, which
claimed prod always sets the catalog before middleware runs — true again for
the generated entry after the C1 fix, but not for a custom entry that calls
createProductionHandlers directly.

I2: dev HMR editing app/authz/*.ts reloaded the page while the OLD catalog
stayed authoritative (watch.ts classifies any non-CSS change as "server";
hotUpdate had no authz/ branch) — a false security signal, since tightening
or removing a permission looked like it took effect but didn't until a
restart. Added the branch (packages/dev-server/src/index.ts), and gave
loadAppAuthzCatalog (authz-boot.ts) an injectable importer: a raw import()
would have silently no-op'd on the re-import (Bun caches local TS/JS modules
by filesystem path and ignores query strings), so the hot path routes through
loadModule (pipeline.ts) instead, which copies the edited file to a versioned
sibling specifically to defeat that cache.

I4: added direct createProductionHandlers/applyAuthzManifestEarly tests
(packages/dev-server/test/authz-prod.test.ts: conflict throws naming both
files, missing default export warns and skips, empty array yields an empty
catalog, a second call re-validates rather than trusting a stale singleton)
and the regression test that matters most
(packages/cli/test/authz-prod-coldstart.test.ts): a real `runBuild` + a real
`bun dist/server.js` boot, with a middleware module reading
getAuthzCatalog() at module scope, asserting it actually serves a request.

M5: startServer built its own router once, then loadAppAuthzCatalog built a
second one from scratch on every dev boot and every authz/ hot reload.
loadAppAuthzCatalog now accepts either an appDir (still used standalone, e.g.
by the test suite) or an already-built Router, and both call sites in
index.ts now pass the router they already have.

Every fix in this round was verified non-vacuous by sabotaging it and
confirming the corresponding test fails, then reverting.
This commit is contained in:
2026-08-04 23:16:41 +05:30
parent 226217ecbf
commit 57097c8204
9 changed files with 535 additions and 41 deletions
+2
View File
@@ -1423,6 +1423,7 @@
"@wrnexus/dev-server": { "@wrnexus/dev-server": {
".": [ ".": [
"AssetServer", "AssetServer",
"AuthzManifestEntry",
"FetchHandler", "FetchHandler",
"GatewayApp", "GatewayApp",
"GatewayAuth", "GatewayAuth",
@@ -1435,6 +1436,7 @@
"ServeOptions", "ServeOptions",
"WrnCompileMetrics", "WrnCompileMetrics",
"WsData", "WsData",
"applyAuthzManifestEarly",
"createHandlers", "createHandlers",
"createProductionHandlers", "createProductionHandlers",
"createProductionServer", "createProductionServer",
+33 -14
View File
@@ -2,15 +2,32 @@
* A process-wide authorization catalog registry, mirroring `@wrnexus/db`'s * A process-wide authorization catalog registry, mirroring `@wrnexus/db`'s
* `client.ts` (`setDb`/`getDb`/`hasDb`). It exists for the same reason: app * `client.ts` (`setDb`/`getDb`/`hasDb`). It exists for the same reason: app
* middleware runs at module-eval time — `app/middleware/*.ts` registers * middleware runs at module-eval time — `app/middleware/*.ts` registers
* `authzMiddleware({ catalog, store, ... })` itself, and it needs the merged * `authzMiddleware({ catalog, store, ... })` itself, an EAGER call (the same
* catalog *then*, before the first request. Passing it through `ctx` does not * shape as `logger.ts`'s `export default requestLogger({...})`), and it needs
* work at that point, so the framework loads and merges every `app/authz/*.ts` * the merged catalog *then*, before its own module body finishes running.
* declaration at boot (dev: `loadAppAuthzCatalog` + `setAuthzCatalog`, before * Passing it through `ctx` does not work at that point, so the framework
* middleware is resolved; prod: `mergeCatalogs` over the statically-imported * loads and merges every `app/authz/*.ts` declaration and stashes it here
* declarations + `setAuthzCatalog`, before the server starts listening) and * before any other module can observe it:
* stashes it here. The framework never installs `authzMiddleware` itself — the *
* app always chooses its own store and registers the middleware; this registry * - dev: `startServer` calls `loadAppAuthzCatalog` + `setAuthzCatalog`
* only makes the merged catalog reachable when it does. * before middleware is resolved.
* - prod (the normal `wrnexus build` output): the generated entry statically
* imports a small `.authz-setup.ts` module FIRST — before any page, API,
* or middleware import — which calls `setAuthzCatalog` at ITS OWN module
* scope. ES modules evaluate every static import before the importing
* module's body runs, and evaluate sibling imports in declaration order,
* so import position is evaluation order: this guarantees the catalog
* exists before app middleware's own module body (which may read it
* eagerly) ever evaluates. `createProductionHandlers` (`prod.ts`) then
* repeats the merge as an idempotent second pass, mainly so a caller who
* bypasses the generated entry and invokes it directly still gets a
* catalog — for THAT path specifically, an eager module-scope read in
* middleware is only safe if the caller sets the catalog before importing
* the middleware itself, since no generated `.authz-setup.ts` runs first.
*
* The framework never installs `authzMiddleware` itself — the app always
* chooses its own store and registers the middleware; this registry only
* makes the merged catalog reachable when it does.
*/ */
import type { AuthzCatalog } from "./types.ts"; import type { AuthzCatalog } from "./types.ts";
@@ -28,11 +45,13 @@ export function getAuthzCatalog(): AuthzCatalog {
if (!catalog) { if (!catalog) {
throw new Error( throw new Error(
"WRN-AUTHZ-SETUP: no authorization catalog is configured. The dev server and " + "WRN-AUTHZ-SETUP: no authorization catalog is configured. The dev server and " +
"production build call loadAppAuthzCatalog()/mergeCatalogs() and setAuthzCatalog() " + "`wrnexus build`'s generated production entry both call setAuthzCatalog() before " +
"automatically before your app's middleware runs. If you're seeing this, either " + "any other module — including your app's middleware — evaluates. If you're seeing " +
"getAuthzCatalog() ran before that boot step (e.g. at import time) or you're " + "this: (a) you're on a custom production entry that calls createProductionHandlers " +
"outside the normal boot path (a standalone script or test) and must call " + "directly instead of the generated one, so you must call setAuthzCatalog(catalog) " +
"setAuthzCatalog(catalog) yourself first.", "yourself before importing anything that reads it eagerly; or (b) you're outside " +
"the normal boot path entirely (a standalone script or test) and must call " +
"setAuthzCatalog(catalog) first.",
); );
} }
return catalog; return catalog;
+52 -9
View File
@@ -563,6 +563,46 @@ export async function runBuild(appRoot: string): Promise<void> {
const imports: string[] = []; const imports: string[] = [];
let counter = 0; let counter = 0;
// Authorization: emit a small side-effecting module that statically imports
// every app/authz/*.ts declaration and calls setAuthzCatalog EAGERLY, then
// import THAT MODULE FIRST — before pages/api/realtime/middleware/
// components/layouts — so it runs before any other static import's module
// body, including app middleware that reads getAuthzCatalog() at module
// scope (the same eager shape authzMiddleware({ catalog, ... }) itself
// requires; app/middleware/logger.ts's `export default requestLogger({...})`
// is the same pattern). ES modules evaluate every static import before the
// importing module's own body runs, and evaluate sibling imports in
// declaration order — so import POSITION is evaluation order, and this
// must be imports[0], strictly before every other push into `imports`
// below (in particular before any `mw*` import). This module is
// deliberately silent about a missing default export (see
// applyAuthzManifestEarly in @wrnexus/dev-server): createProductionHandlers
// performs the identical merge again, with its warnings, as an idempotent
// second pass — both for adapters that bypass this generated entry and to
// avoid warning twice about the same declaration in the normal path.
{
let authzSetupCounter = 0;
const authzSetupImports: string[] = [];
const authzSetupEntries = router.authz
.map((a) => {
const v = `d${authzSetupCounter++}`;
authzSetupImports.push(`import * as ${v} from ${JSON.stringify(fwd(a.file))};`);
return `{ source: ${JSON.stringify(fwd(a.file))}, module: ${v}.default }`;
})
.join(", ");
const authzSetupContent = `// AUTO-GENERATED authz catalog setup — do not edit.
// Imported FIRST by the production entry (see the "Authorization" comment
// there) so getAuthzCatalog() is populated before any other static import's
// module body runs.
import { applyAuthzManifestEarly } from "@wrnexus/dev-server";
${authzSetupImports.join("\n")}
applyAuthzManifestEarly([${authzSetupEntries}]);
`;
writeFileSync(join(distDir, ".authz-setup.ts"), authzSetupContent, "utf8");
imports.push(`import "./.authz-setup.ts";`);
}
const manifestRoutes = (routes: Route[]): string => { const manifestRoutes = (routes: Route[]): string => {
const parts = routes.map((r) => { const parts = routes.map((r) => {
const v = `m${counter++}`; const v = `m${counter++}`;
@@ -604,15 +644,18 @@ export async function runBuild(appRoot: string): Promise<void> {
.join(", "); .join(", ");
if (router.layouts.length) console.log(`✓ Layouts: ${router.layouts.length}`); if (router.layouts.length) console.log(`✓ Layouts: ${router.layouts.length}`);
// Authorization declarations (app/authz/*.ts), statically imported like // Authorization declarations again, this time for ProdOptions.authz — a
// components/layouts — NOT baked into JSON like schemasJs, because the // SEPARATE set of static imports of the exact same files (harmless; ES
// catalog contains policy FUNCTIONS, which JSON.stringify cannot carry. // modules are evaluated once and shared across every importer), statically
// Each module is passed through by reference in ProdOptions.authz and // imported like components/layouts — NOT baked into JSON like schemasJs,
// merged into the process-wide catalog at prod startup (prod.ts), before // because the catalog contains policy FUNCTIONS, which JSON.stringify
// the server begins listening, so a conflicting pair of declarations fails // cannot carry. Each module is passed through by reference and merged
// the boot instead of surfacing on the first request. A file with no // AGAIN into the process-wide catalog by createProductionHandlers's second
// default export becomes `module: undefined` here; prod.ts warns and skips // pass (prod.ts) — see the ".authz-setup.ts" block above for the EARLY,
// it, matching the dev loader (authz-boot.ts). // eager pass that actually makes the catalog visible to app middleware. A
// file with no default export becomes `module: undefined` here;
// createProductionHandlers warns and skips it, matching the dev loader
// (authz-boot.ts).
const authzLit = router.authz const authzLit = router.authz
.map((a) => { .map((a) => {
const v = `az${counter++}`; const v = `az${counter++}`;
@@ -0,0 +1,128 @@
import { afterAll, expect, test } from "bun:test";
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
import { join } from "node:path";
import { runBuild } from "../src/build.ts";
// This is the regression test for a CRITICAL boot-order bug (C1): in the
// generated production entry, app middleware was emitted as a static import
// AFTER the authz merge/set happened in the entry's own body. ES modules
// evaluate every static import (including middleware) before the importing
// module's body runs, so a middleware module reading getAuthzCatalog() at its
// own module scope — the SAME eager shape authzMiddleware({ catalog, ... })
// itself requires, and the same pattern examples/basic-app's
// app/middleware/logger.ts uses for `export default requestLogger({...})` —
// saw an unset catalog and threw, taking the app down at deploy while every
// other gate (typecheck/lint/tests/a plain `bun run build`) stayed green.
// A manual build+boot caught it once; this makes that check permanent.
//
// Fixtures live inside the repo tree, not os.tmpdir(): both the scaffolded
// app files AND the code Bun.build bundles from them import "@wrnexus/authz"
// by bare specifier, which resolves via the root tsconfig.json `paths` map
// walked from the *importing file's* location — an out-of-tree path never
// reaches it.
const scratchRoot = join(import.meta.dir, ".tmp-authz-coldstart");
mkdirSync(scratchRoot, { recursive: true });
afterAll(() => {
rmSync(scratchRoot, { recursive: true, force: true });
});
test("a module-eval getAuthzCatalog() in app middleware survives a real production cold start", async () => {
const root = mkdtempSync(join(scratchRoot, "app-"));
const appDir = join(root, "app");
mkdirSync(join(appDir, "api"), { recursive: true });
mkdirSync(join(appDir, "authz"), { recursive: true });
mkdirSync(join(appDir, "middleware"), { recursive: true });
writeFileSync(
join(root, "package.json"),
JSON.stringify({ name: "authz-coldstart-fixture" }),
"utf8",
);
writeFileSync(
join(appDir, "api", "health.ts"),
`export function GET() {
return Response.json({ ok: true });
}
`,
"utf8",
);
writeFileSync(
join(appDir, "authz", "main.ts"),
`import { defineAuthz } from "@wrnexus/authz";
export default defineAuthz({ permissions: { "post:read": {} } });
`,
"utf8",
);
writeFileSync(
join(appDir, "middleware", "authz-probe.ts"),
`import { authzMiddleware, getAuthzCatalog, memoryPermissionStore } from "@wrnexus/authz";
// Module-eval-time read, on purpose: this is exactly the pattern the
// setAuthzCatalog() singleton exists for, and exactly what took the app down
// under the pre-fix boot order. If getAuthzCatalog() throws here, this WHOLE
// MODULE fails to evaluate and the entry crashes at import time, before
// Bun.serve is ever reached.
export default authzMiddleware({ catalog: getAuthzCatalog(), store: memoryPermissionStore() });
`,
"utf8",
);
await runBuild(root);
const serverPath = join(root, "dist", "server.js");
const proc = Bun.spawn({
cmd: ["bun", serverPath],
env: { ...process.env, PORT: "0" },
stdout: "pipe",
stderr: "pipe",
cwd: root,
});
let port: number | undefined;
let stderrText = "";
try {
const reader = proc.stdout.getReader();
const errReader = proc.stderr.getReader();
const decoder = new TextDecoder();
let buffered = "";
const deadline = Date.now() + 20_000;
const TIMED_OUT = Symbol("timed out");
while (port === undefined && Date.now() < deadline) {
const outcome = await Promise.race([
reader.read(),
new Promise<typeof TIMED_OUT>((resolve) => setTimeout(() => resolve(TIMED_OUT), 250)),
]);
if (outcome === TIMED_OUT) continue;
const { value, done } = outcome;
if (done) break;
buffered += decoder.decode(value);
const match = /listening on http:\/\/[^:]+:(\d+)/.exec(buffered);
if (match) port = Number(match[1]);
}
reader.releaseLock();
if (port === undefined) {
// Drain stderr for a useful failure message before giving up.
const errOutcome = await Promise.race([
errReader.read(),
new Promise<typeof TIMED_OUT>((resolve) => setTimeout(() => resolve(TIMED_OUT), 500)),
]);
if (errOutcome !== TIMED_OUT && errOutcome.value) {
stderrText += decoder.decode(errOutcome.value);
}
errReader.releaseLock();
throw new Error(
`production server never printed a "listening on" line within 20s. stderr:\n${stderrText}`,
);
}
errReader.releaseLock();
const response = await fetch(`http://127.0.0.1:${port}/api/health`);
expect(response.status).toBe(200);
expect(await response.json()).toEqual({ ok: true });
} finally {
proc.kill();
await proc.exited;
}
}, 30_000);
+29 -4
View File
@@ -1,5 +1,5 @@
import { pathToFileURL } from "node:url"; import { pathToFileURL } from "node:url";
import { buildRouter } from "@wrnexus/router"; import { buildRouter, type Router } from "@wrnexus/router";
import { import {
emptyCatalog, emptyCatalog,
mergeCatalogs, mergeCatalogs,
@@ -8,14 +8,39 @@ import {
type CatalogSource, type CatalogSource,
} from "@wrnexus/authz"; } from "@wrnexus/authz";
/** Imports one declaration module. Defaults to a raw `import()`; the hot-reload
* call site passes `loadModule` instead (see the note below on why). */
export type AuthzImporter = (file: string) => Promise<{ default?: AuthzModule }>;
const rawImport: AuthzImporter = (file) =>
import(pathToFileURL(file).href) as Promise<{ default?: AuthzModule }>;
/** /**
* Load and merge every `app/authz/*.ts` declaration. Conflicts throw so a * Load and merge every `app/authz/*.ts` declaration. Conflicts throw so a
* misconfigured catalog fails the boot rather than silently changing who can * misconfigured catalog fails the boot rather than silently changing who can
* do what. An app with no `app/authz/` directory gets an empty catalog rather * do what. An app with no `app/authz/` directory gets an empty catalog rather
* than an error, since not every app uses permissions. * than an error, since not every app uses permissions.
*
* Accepts either an app directory — the original, standalone shape, still
* used by the test suite and by any caller without a router on hand — or an
* already-built `Router`. `startServer` passes its own router (built once at
* `:315` with the full `componentDirs`/`externalRoutes`/`middlewareFiles`
* options) to avoid a second, redundant filesystem scan of the whole `app/`
* tree on every dev boot and on every hot reload of an `app/authz/*.ts` file.
*
* `importModule` defaults to a raw dynamic `import()`, correct for the
* initial boot. On a HOT reload, the caller must instead pass `loadModule`
* (from `./pipeline.ts`): Bun caches local TS/JS modules by filesystem path
* and ignores query strings, so re-`import()`-ing the same absolute path
* after an edit silently returns the stale, already-cached module —
* `loadModule` is what copies an edited file to a versioned sibling path
* specifically to defeat that cache.
*/ */
export async function loadAppAuthzCatalog(appDir: string): Promise<AuthzCatalog> { export async function loadAppAuthzCatalog(
const router = buildRouter(appDir); appDirOrRouter: string | Router,
importModule: AuthzImporter = rawImport,
): Promise<AuthzCatalog> {
const router = typeof appDirOrRouter === "string" ? buildRouter(appDirOrRouter) : appDirOrRouter;
if (!router.authz.length) return emptyCatalog(); if (!router.authz.length) return emptyCatalog();
const sources: CatalogSource[] = []; const sources: CatalogSource[] = [];
for (const entry of router.authz) { for (const entry of router.authz) {
@@ -24,7 +49,7 @@ export async function loadAppAuthzCatalog(appDir: string): Promise<AuthzCatalog>
// same failure class as a genuine conflict (a broken/misconfigured catalog), // same failure class as a genuine conflict (a broken/misconfigured catalog),
// and letting it propagate fails the boot loudly instead of silently // and letting it propagate fails the boot loudly instead of silently
// producing a partial catalog. Do not "helpfully" wrap this in a try/catch. // producing a partial catalog. Do not "helpfully" wrap this in a try/catch.
const imported = (await import(pathToFileURL(entry.file).href)) as { default?: AuthzModule }; const imported = await importModule(entry.file);
if (!imported.default) { if (!imported.default) {
console.warn(`[wrnexus] authz declaration ${entry.file} has no default export; skipping.`); console.warn(`[wrnexus] authz declaration ${entry.file} has no default export; skipping.`);
continue; continue;
+39 -3
View File
@@ -32,7 +32,7 @@ import {
} from "@wrnexus/db"; } from "@wrnexus/db";
import { connectFromConfig } from "@wrnexus/db/connect"; import { connectFromConfig } from "@wrnexus/db/connect";
import { configureStorage, type StorageConfig } from "@wrnexus/uploader"; import { configureStorage, type StorageConfig } from "@wrnexus/uploader";
import { setAuthzCatalog, type AuthzCatalog } from "@wrnexus/authz"; import { setAuthzCatalog, type AuthzCatalog, type AuthzModule } from "@wrnexus/authz";
import { loadAppAuthzCatalog } from "./authz-boot.ts"; import { loadAppAuthzCatalog } from "./authz-boot.ts";
import { realtimeBusFromConfig } from "./realtime-bus.ts"; import { realtimeBusFromConfig } from "./realtime-bus.ts";
import { import {
@@ -344,8 +344,11 @@ export async function startServer(opts: ServeOptions): Promise<RunningServer> {
// the framework never installs one) runs at request time and needs // the framework never installs one) runs at request time and needs
// getAuthzCatalog() already populated by then. An app with no declarations // getAuthzCatalog() already populated by then. An app with no declarations
// gets an empty catalog; a genuine conflict between declarations throws and // gets an empty catalog; a genuine conflict between declarations throws and
// fails this boot loudly. // fails this boot loudly. Pass the already-built `router` (not `appDir`):
const authzCatalog: AuthzCatalog = await loadAppAuthzCatalog(appDir); // it was just built above with the full componentDirs/externalRoutes/
// middlewareFiles options, so this avoids a second, redundant filesystem
// scan of the whole app/ tree on every dev boot.
const authzCatalog: AuthzCatalog = await loadAppAuthzCatalog(router);
setAuthzCatalog(authzCatalog); setAuthzCatalog(authzCatalog);
// i18n is opt-in by the presence of app/locales/*.json. // i18n is opt-in by the presence of app/locales/*.json.
@@ -615,6 +618,33 @@ export async function startServer(opts: ServeOptions): Promise<RunningServer> {
middleware.invalidate(); middleware.invalidate();
const appFiles = files.filter((file) => !isAbsolute(file)); const appFiles = files.filter((file) => !isAbsolute(file));
// Without this branch, editing app/authz/*.ts reloaded the page (watch.ts
// classifies any non-CSS change as "server") while the OLD catalog stayed
// authoritative — a false security signal: tightening or removing a
// permission LOOKS like it took effect but does not until a restart. A
// raw `import()` here would silently no-op: Bun caches local TS/JS
// modules by filesystem path and ignores query strings, so the edited
// file must be re-imported through `loadModule` (pipeline.ts), which
// copies it to a versioned sibling path specifically to defeat that
// cache — the same mechanism every other hot-reloaded module already
// uses. `router` was just rebuilt above, so this reuses it rather than
// re-scanning the filesystem a third time.
if (appFiles.some((file) => file === "authz" || file.startsWith("authz/"))) {
try {
const nextAuthzCatalog = await loadAppAuthzCatalog(
router,
(file) => loadModule(file) as Promise<{ default?: AuthzModule }>,
);
setAuthzCatalog(nextAuthzCatalog);
runtimeDeps.authz = nextAuthzCatalog;
} catch (error) {
console.error(
"[wrnexus] authz hot update failed — the PREVIOUS catalog remains authoritative " +
"until this is fixed and the file saved again",
error,
);
}
}
if (appFiles.some((file) => file === "schemas" || file.startsWith("schemas/"))) { if (appFiles.some((file) => file === "schemas" || file.startsWith("schemas/"))) {
assets.updateSchemas(await schemaRuntime(router)); assets.updateSchemas(await schemaRuntime(router));
} }
@@ -730,5 +760,11 @@ export type {
// Deployment: the portable production handler + the node:http adapter. // Deployment: the portable production handler + the node:http adapter.
export { createProductionServer, createProductionHandlers } from "./prod.ts"; export { createProductionServer, createProductionHandlers } from "./prod.ts";
// Internal: called only by the generated `.authz-setup.ts` module (see
// packages/cli/src/build.ts) to populate the authorization catalog before any
// other static import — including app middleware — evaluates. Not meant for
// direct use by application code.
export { applyAuthzManifestEarly } from "./prod.ts";
export type { AuthzManifestEntry } from "./prod.ts";
export { toRequest, writeResponse, nodeListener, serveNode } from "./adapters/node.ts"; export { toRequest, writeResponse, nodeListener, serveNode } from "./adapters/node.ts";
export type { FetchHandler } from "./adapters/node.ts"; export type { FetchHandler } from "./adapters/node.ts";
+58 -11
View File
@@ -109,10 +109,14 @@ export interface ProdOptions {
* `app/authz/*.ts`, statically imported into the generated entry (the * `app/authz/*.ts`, statically imported into the generated entry (the
* catalog holds policy FUNCTIONS, so — unlike `schemasJs` — it cannot be * catalog holds policy FUNCTIONS, so — unlike `schemasJs` — it cannot be
* JSON-serialised). `module` is `undefined` for a file with no default * JSON-serialised). `module` is `undefined` for a file with no default
* export; `createProductionHandlers` warns and skips it, then merges the * export. In the NORMAL generated-entry build, the catalog is already set
* rest into the process-wide catalog before the server accepts traffic. * by the generated `.authz-setup.ts` module before this ever runs (see
* `applyAuthzManifestEarly` below); `createProductionHandlers` merges this
* same list again as an idempotent second pass — with its warnings — so a
* caller that bypasses the generated entry and calls it directly still gets
* a correctly merged catalog.
*/ */
authz?: { source: string; module?: AuthzModule }[]; authz?: AuthzManifestEntry[];
/** Resolved i18n bundle (default lang + locale messages). */ /** Resolved i18n bundle (default lang + locale messages). */
i18n?: ResolvedI18n; i18n?: ResolvedI18n;
/** Default database connection (driver + url); enables `getDb()`. */ /** Default database connection (driver + url); enables `getDb()`. */
@@ -198,6 +202,40 @@ export function resolveProductionHostname(
return environmentHostname?.trim() || explicit || "0.0.0.0"; return environmentHostname?.trim() || explicit || "0.0.0.0";
} }
/** One `app/authz/*.ts` declaration as passed through `ProdOptions.authz`. */
export interface AuthzManifestEntry {
source: string;
/** Undefined when the declaration file has no default export. */
module?: AuthzModule;
}
function resolveAuthzSources(
entries: AuthzManifestEntry[],
): { source: string; module: AuthzModule }[] {
return entries.flatMap((entry) =>
entry.module ? [{ source: entry.source, module: entry.module }] : [],
);
}
/**
* Merge + `setAuthzCatalog` as EARLY as possible, deliberately silently (no
* missing-default-export warnings). Called ONLY from the generated
* `.authz-setup.ts` module that `wrnexus build` imports FIRST in the
* production entry — before any other static import, including app
* middleware — so that a middleware module reading `getAuthzCatalog()` at its
* own module scope (the same eager shape `authzMiddleware({ catalog, ... })`
* itself requires) sees a populated catalog. `createProductionHandlers` below
* performs the exact same merge again, WITH its warnings, as the canonical,
* always-warns second pass — this function stays silent specifically so the
* normal boot path does not print the same "no default export" warning
* twice. A genuine conflict still throws here (via `mergeCatalogs`), which
* fails the boot at import time — before the entry body, and thus
* `createProductionHandlers`, ever runs.
*/
export function applyAuthzManifestEarly(entries: AuthzManifestEntry[]): void {
setAuthzCatalog(mergeCatalogs(resolveAuthzSources(entries)));
}
/** Build the route-matching tables + a module map from the manifest. */ /** Build the route-matching tables + a module map from the manifest. */
function buildProdRouter(manifest: ProdManifest): { function buildProdRouter(manifest: ProdManifest): {
router: Router; router: Router;
@@ -371,14 +409,23 @@ export function createProductionHandlers(
// Bun.serve path in createProductionServer below. The app still registers // Bun.serve path in createProductionServer below. The app still registers
// authzMiddleware itself with its own store; this only makes the merged // authzMiddleware itself with its own store; this only makes the merged
// catalog reachable. No declarations -> an empty catalog, no error. // catalog reachable. No declarations -> an empty catalog, no error.
const authzSources = (opts.authz ?? []).flatMap((entry) => { //
if (!entry.module) { // In the NORMAL generated-entry build, this is a deliberately redundant
console.warn(`[wrnexus] authz declaration ${entry.source} has no default export; skipping.`); // SECOND pass: the generated `.authz-setup.ts` module already ran this
return []; // exact merge (silently, via applyAuthzManifestEarly above) before this
} // function was ever called, specifically so a middleware module that reads
return [{ source: entry.source, module: entry.module }]; // getAuthzCatalog() at its own module scope sees a populated catalog — this
}); // function's body runs too late for that (it is reached only once every
const authzCatalog = mergeCatalogs(authzSources); // OTHER static import, including middleware, has already evaluated). This
// pass still runs unconditionally (not skipped when the catalog is already
// set) so a direct caller that bypasses the generated entry — and thus
// never ran that early pass — still gets a correctly merged, validated
// catalog, and so this function's own authorization handling stays fully
// testable in isolation.
for (const missing of (opts.authz ?? []).filter((entry) => !entry.module)) {
console.warn(`[wrnexus] authz declaration ${missing.source} has no default export; skipping.`);
}
const authzCatalog = mergeCatalogs(resolveAuthzSources(opts.authz ?? []));
setAuthzCatalog(authzCatalog); setAuthzCatalog(authzCatalog);
// Middleware is already an ordered array of functions. // Middleware is already an ordered array of functions.
+145
View File
@@ -0,0 +1,145 @@
import { describe, expect, test } from "bun:test";
import { defineAuthz, getAuthzCatalog } from "@wrnexus/authz";
import {
applyAuthzManifestEarly,
createProductionHandlers,
type ProdManifest,
} from "../src/prod.ts";
const EMPTY_MANIFEST: ProdManifest = {
pages: [],
api: [],
realtime: [],
middleware: [],
components: [],
layouts: [],
};
describe("createProductionHandlers authorization wiring (the idempotent second pass)", () => {
test("an empty (or absent) authz array yields an empty catalog, no error", () => {
createProductionHandlers(EMPTY_MANIFEST, { authz: [] });
expect(getAuthzCatalog().permissions.size).toBe(0);
createProductionHandlers(EMPTY_MANIFEST, {});
expect(getAuthzCatalog().permissions.size).toBe(0);
});
test("a declaration with no default export warns and is skipped, not fatal", () => {
const originalWarn = console.warn;
const warnings: unknown[][] = [];
console.warn = (...args: unknown[]) => {
warnings.push(args);
};
try {
createProductionHandlers(EMPTY_MANIFEST, {
authz: [
{ source: "broken.ts", module: undefined },
{
source: "ok.ts",
module: defineAuthz({ permissions: { "post:read": {} } }),
},
],
});
} finally {
console.warn = originalWarn;
}
expect(getAuthzCatalog().permissions.has("post:read")).toBe(true);
expect(getAuthzCatalog().permissions.size).toBe(1);
expect(warnings.some((args) => args.some((arg) => String(arg).includes("broken.ts")))).toBe(
true,
);
});
test("a conflicting pair of declarations throws, naming both source files", () => {
expect(() =>
createProductionHandlers(EMPTY_MANIFEST, {
authz: [
{
source: "a.ts",
module: defineAuthz({ permissions: { "post:read": { risk: "low" } } }),
},
{
source: "b.ts",
module: defineAuthz({ permissions: { "post:read": { risk: "high" } } }),
},
],
}),
).toThrow(/WRN-AUTHZ-CONFLICT/);
let thrown: unknown;
try {
createProductionHandlers(EMPTY_MANIFEST, {
authz: [
{
source: "a.ts",
module: defineAuthz({ permissions: { "post:read": { risk: "low" } } }),
},
{
source: "b.ts",
module: defineAuthz({ permissions: { "post:read": { risk: "high" } } }),
},
],
});
} catch (error) {
thrown = error;
}
expect(thrown).toBeInstanceOf(Error);
const message = (thrown as Error).message;
expect(message).toContain("a.ts");
expect(message).toContain("b.ts");
});
test("calling createProductionHandlers a second time with different declarations re-validates, not skips", () => {
// Regression guard for the "skip merging if a catalog is already set"
// trap: since setAuthzCatalog is a process-wide singleton, an earlier
// test (or an earlier createProductionHandlers call in the same process)
// can leave hasAuthzCatalog() true. This call must still independently
// merge+validate its OWN opts.authz, not silently trust a stale catalog
// left over from something else.
createProductionHandlers(EMPTY_MANIFEST, {
authz: [{ source: "first.ts", module: defineAuthz({ permissions: { "a:read": {} } }) }],
});
expect(getAuthzCatalog().permissions.has("a:read")).toBe(true);
createProductionHandlers(EMPTY_MANIFEST, {
authz: [{ source: "second.ts", module: defineAuthz({ permissions: { "b:read": {} } }) }],
});
expect(getAuthzCatalog().permissions.has("a:read")).toBe(false);
expect(getAuthzCatalog().permissions.has("b:read")).toBe(true);
});
});
describe("applyAuthzManifestEarly (the eager, silent pass called only by the generated .authz-setup.ts)", () => {
test("sets the catalog from valid declarations", () => {
applyAuthzManifestEarly([
{ source: "early.ts", module: defineAuthz({ permissions: { "early:read": {} } }) },
]);
expect(getAuthzCatalog().permissions.has("early:read")).toBe(true);
});
test("silently skips a missing default export — no warning, no throw", () => {
const originalWarn = console.warn;
let warnCalls = 0;
console.warn = () => {
warnCalls++;
};
try {
expect(() =>
applyAuthzManifestEarly([{ source: "broken.ts", module: undefined }]),
).not.toThrow();
} finally {
console.warn = originalWarn;
}
expect(warnCalls).toBe(0);
expect(getAuthzCatalog().permissions.size).toBe(0);
});
test("still throws on a genuine conflict (fatal either way, just earlier)", () => {
expect(() =>
applyAuthzManifestEarly([
{ source: "a.ts", module: defineAuthz({ permissions: { "post:read": { risk: "low" } } }) },
{ source: "b.ts", module: defineAuthz({ permissions: { "post:read": { risk: "high" } } }) },
]),
).toThrow(/WRN-AUTHZ-CONFLICT/);
});
});
@@ -34,6 +34,19 @@ afterAll(() => {
rmSync(scratchRoot, { recursive: true, force: true }); rmSync(scratchRoot, { recursive: true, force: true });
}); });
async function waitFor(
condition: () => boolean,
timeoutMs: number,
intervalMs = 50,
): Promise<void> {
const deadline = Date.now() + timeoutMs;
while (Date.now() < deadline) {
if (condition()) return;
await new Promise((resolve) => setTimeout(resolve, intervalMs));
}
if (!condition()) throw new Error(`waitFor: condition was not met within ${timeoutMs}ms`);
}
describe("dev boot loads the authz catalog before middleware is resolved", () => { describe("dev boot loads the authz catalog before middleware is resolved", () => {
test("an app with declarations makes getAuthzCatalog() return them after boot", async () => { test("an app with declarations makes getAuthzCatalog() return them after boot", async () => {
const appDir = scaffold("has-decls", { const appDir = scaffold("has-decls", {
@@ -100,4 +113,40 @@ export default defineAuthz({ permissions: { "post:read": { risk: "high" } } });`
expect(message).toContain(join(appDir, "authz", "a.ts")); expect(message).toContain(join(appDir, "authz", "a.ts"));
expect(message).toContain(join(appDir, "authz", "b.ts")); expect(message).toContain(join(appDir, "authz", "b.ts"));
}); });
test("editing a declaration in a RUNNING dev server updates the live catalog, via the real file watcher", async () => {
const appDir = scaffold("hmr-live", {
"main.ts": `import { defineAuthz } from "@wrnexus/authz";
export default defineAuthz({ permissions: { "post:read": {} } });`,
});
const server = await startServer({
appDir,
hostname: "127.0.0.1",
port: 0,
mode: "development",
hmr: true,
});
try {
expect(getAuthzCatalog().permissions.has("post:read")).toBe(true);
expect(getAuthzCatalog().permissions.has("post:write")).toBe(false);
// A real write to disk, picked up by the real fs watcher (watch.ts /
// startWatcher) — not a direct call into any internal hot-update
// function. This is the only way to prove the wiring actually works,
// as opposed to proving only that the code branch exists.
writeFileSync(
join(appDir, "authz", "main.ts"),
`import { defineAuthz } from "@wrnexus/authz";
export default defineAuthz({ permissions: { "post:write": {} } });`,
"utf8",
);
await waitFor(() => getAuthzCatalog().permissions.has("post:write"), 10_000);
expect(getAuthzCatalog().permissions.has("post:write")).toBe(true);
expect(getAuthzCatalog().permissions.has("post:read")).toBe(false);
} finally {
server.stop();
}
}, 15_000);
}); });