@rogatio/cli 6.21.0 → 6.21.1

package/dist/node/index.js

@@ -2318,18 +2318,19 @@ import { isAbsolute as isAbsolute3 } from "node:path";
 import { Buffer as Buffer2 } from "node:buffer";
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join6 } from "node:path";
+import { timingSafeEqual } from "node:crypto";
 import { lookup as dnsLookup2 } from "node:dns/promises";
 import {
   createServer as createServer2
 } from "node:http";
 import { connect } from "node:net";
 import { Worker } from "node:worker_threads";
+import { randomBytes } from "node:crypto";
 import { lookup as dnsLookup } from "node:dns/promises";
 import { request as httpRequest2 } from "node:http";
 import { request as httpsRequest } from "node:https";
-import { createHash as createHash2, randomBytes, timingSafeEqual } from "node:crypto";
+import { createHash as createHash2, randomBytes as randomBytes2, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
 import { spawn as spawn4 } from "node:child_process";
-import { randomBytes as randomBytes2 } from "node:crypto";
 import { createHash as createHash3 } from "node:crypto";
 import { createHash as createHash4 } from "node:crypto";
 var __create = Object.create;
@@ -25024,6 +25025,74 @@ async function sourceMatchesWithinDeadline(source, url) {
 function matchUrlCapturesWithinDeadline(urlRegex, url) {
   return runRegexExec(url, urlRegex, RUNTIME_LIMITS.maxRegexDeadlineMs);
 }
+async function readMockFile(root, logicalPath, signal) {
+  return readConfinedPathBytes(root, logicalPath, signal);
+}
+function mintToken() {
+  return randomBytes(32).toString("hex");
+}
+function headerName(name) {
+  return name.toLowerCase();
+}
+function waitForDelay(delayMs, signal) {
+  if (signal?.aborted) return Promise.resolve(failure("runtime.timeout"));
+  if (delayMs === void 0 || delayMs <= 0) {
+    return Promise.resolve({ ok: true, value: void 0 });
+  }
+  return new Promise((resolve12) => {
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve12(failure("runtime.timeout"));
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve12({ ok: true, value: void 0 });
+    }, delayMs);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+async function renderMockResponse(options) {
+  const { mock, fileRoot, method, signal } = options;
+  const waited = await waitForDelay(mock.delayMs, signal);
+  if (!waited.ok) return waited;
+  let fullBytes;
+  if (mock.body !== void 0) {
+    fullBytes = new TextEncoder().encode(mock.body);
+  } else if (mock.file !== void 0) {
+    if (fileRoot === void 0) return failure("runtime.file-denied");
+    if (!isConfinedFileSupported()) {
+      return failure("runtime.platform-unsupported");
+    }
+    const read2 = await readMockFile(fileRoot, mock.file, signal);
+    if (!read2.ok) return read2;
+    fullBytes = read2.value;
+  } else {
+    return failure("runtime.file-denied");
+  }
+  const headers = [];
+  let hasContentType = false;
+  let hasCacheControl = false;
+  for (const header of mock.headers ?? []) {
+    const name = headerName(header.name);
+    if (name === "content-length") continue;
+    if (name === "content-type") hasContentType = true;
+    if (name === "cache-control") hasCacheControl = true;
+    headers.push([header.name, header.value]);
+  }
+  if (!hasContentType) {
+    headers.push(["Content-Type", "application/octet-stream"]);
+  }
+  headers.push(["Content-Length", String(fullBytes.byteLength)]);
+  if (!hasCacheControl) headers.push(["Cache-Control", "no-store"]);
+  return {
+    ok: true,
+    value: {
+      status: mock.status,
+      headers,
+      bodyBytes: method === "HEAD" ? new Uint8Array() : fullBytes
+    }
+  };
+}
 var MOCK_LISTENER_PREFIX = "/.rogatio/mock/";
 function isSingleSegment(value) {
   return value.length > 0 && value.length <= 2048 && value !== "." && value !== ".." && !value.includes("/") && !value.includes("\\") && !value.includes("?") && !hasControl(value);
@@ -25402,6 +25471,9 @@ async function fetchAndRewriteAuthorizedResponse(operation, action, options = {}
   };
 }
 var RESPONSE_BODY_LISTENER_PREFIX = "/.rogatio/body/";
+function isSingleSegment2(value) {
+  return value.length > 0 && value.length <= 2048 && value !== "." && value !== ".." && !value.includes("/") && !value.includes("\\") && !value.includes("?") && !hasControl(value);
+}
 function parseResponseBodyRedirect(rawUrl) {
   const queryAt = rawUrl.indexOf("?");
   const path2 = queryAt === -1 ? rawUrl : rawUrl.slice(0, queryAt);
@@ -25412,18 +25484,24 @@ function parseResponseBodyRedirect(rawUrl) {
   if (slash1 <= 0) return null;
   const slash2 = rest.indexOf("/", slash1 + 1);
   if (slash2 <= slash1 + 1) return null;
+  const slash3 = rest.indexOf("/", slash2 + 1);
+  if (slash3 <= slash2 + 1) return null;
+  let token;
   let ruleId;
   let digest;
   try {
-    ruleId = decodeURIComponent(rest.slice(0, slash1));
-    digest = decodeURIComponent(rest.slice(slash1 + 1, slash2));
+    token = decodeURIComponent(rest.slice(0, slash1));
+    ruleId = decodeURIComponent(rest.slice(slash1 + 1, slash2));
+    digest = decodeURIComponent(rest.slice(slash2 + 1, slash3));
   } catch {
     return null;
   }
-  if (ruleId.length === 0 || digest.length === 0) return null;
-  const original = rest.slice(slash2 + 1) + search;
+  if (!isSingleSegment2(token) || !isSingleSegment2(ruleId) || !isSingleSegment2(digest)) {
+    return null;
+  }
+  const original = rest.slice(slash3 + 1) + search;
   if (!/^https?:\/\//i.test(original)) return null;
-  return { ruleId, digest, originalUrl: original };
+  return { token, ruleId, digest, originalUrl: original };
 }
 function originOf(value) {
   const direct = normalizeSiteOrigin(value);
@@ -25492,8 +25570,12 @@ async function revalidateAuthority(project, operations, request) {
     }
   }
   if (matcher.resourceTypes.length > 0) {
-    const resourceType = typeof request.resourceType === "string" ? request.resourceType : void 0;
-    if (resourceType === void 0 || !matcher.resourceTypes.includes(resourceType)) {
+    const supplied = request.resourceType;
+    if (supplied === void 0) {
+      if (operation.kind !== "response-body") {
+        return { allowed: false, reason: "resource-type-unauthorized" };
+      }
+    } else if (typeof supplied !== "string" || !matcher.resourceTypes.includes(supplied)) {
       return { allowed: false, reason: "resource-type-unauthorized" };
     }
   }
@@ -25504,6 +25586,24 @@ async function revalidateAuthority(project, operations, request) {
     operation
   };
 }
+var PROXY_DOCUMENT_CSP = "sandbox; default-src 'none'; script-src 'none'; connect-src 'none'; form-action 'none'; frame-src 'none'";
+var DROPPED_DOCUMENT_HEADERS = /* @__PURE__ */ new Set([
+  "content-security-policy",
+  "content-security-policy-report-only",
+  "x-content-type-options"
+]);
+function sameToken(supplied, expected) {
+  const left = Buffer.from(supplied);
+  const right = Buffer.from(expected);
+  if (left.byteLength !== right.byteLength) return false;
+  return timingSafeEqual(left, right);
+}
+function proxyDocumentHeaders() {
+  return [
+    ["content-security-policy", PROXY_DOCUMENT_CSP],
+    ["x-content-type-options", "nosniff"]
+  ];
+}
 function isBodyOp(op) {
   return op.kind === "request-body" || op.kind === "response-body";
 }
@@ -25906,6 +26006,8 @@ async function authorizeOp(policy, op, url, method, headers) {
   return decision.allowed;
 }
 async function startInterceptProxy(options = {}) {
+  const responseBodyToken = mintToken();
+  const outbound = options.outbound;
   let policy = options.policy ?? null;
   const serveMock = options.serveMock;
   const resolver = options.resolver ?? defaultResolver2;
@@ -26126,10 +26228,11 @@ async function startInterceptProxy(options = {}) {
         endEmpty(res, status);
         return;
       }
-      res.writeHead(
-        rendered.value.status,
-        rendered.value.headers.map(([name, value]) => [name, value])
+      const mockHeaders = rendered.value.headers.flatMap(
+        ([name, value]) => DROPPED_DOCUMENT_HEADERS.has(name.toLowerCase()) ? [] : [[name, value]]
       );
+      mockHeaders.push(...proxyDocumentHeaders());
+      res.writeHead(rendered.value.status, mockHeaders);
       res.end(Buffer.from(rendered.value.bodyBytes));
     } catch {
       endEmpty(res, 502);
@@ -26146,9 +26249,19 @@ async function startInterceptProxy(options = {}) {
       return;
     }
     const parsed = parseResponseBodyRedirect(rawUrl);
+    if (parsed === null) {
+      res.writeHead(400);
+      res.end();
+      return;
+    }
+    if (!sameToken(parsed.token, responseBodyToken)) {
+      res.writeHead(403);
+      res.end();
+      return;
+    }
     const active = policy;
-    if (parsed === null || active === null || active.presetDigest === void 0) {
-      res.writeHead(parsed === null ? 400 : 403);
+    if (active === null || active.presetDigest === void 0) {
+      res.writeHead(403);
       res.end();
       return;
     }
@@ -26189,8 +26302,7 @@ async function startInterceptProxy(options = {}) {
         url: parsed.originalUrl,
         target,
         method: "GET",
-        initiator: initiatorFromHeaders(req.headers, parsed.originalUrl) ?? new URL(target).origin,
-        resourceType: operation.matcher.resourceTypes[0]
+        initiator: initiatorFromHeaders(req.headers, parsed.originalUrl) ?? new URL(target).origin
       }
     );
     if (!allowed.allowed) {
@@ -26209,7 +26321,8 @@ async function startInterceptProxy(options = {}) {
         sourceValue: operation.matcher.source.value,
         presetDigest
       },
-      operation.responseBody
+      operation.responseBody,
+      outbound ?? {}
     );
     if (!fetched.ok) {
       res.writeHead(502);
@@ -26219,7 +26332,7 @@ async function startInterceptProxy(options = {}) {
     const headers = {};
     for (const [name, value] of fetched.value.headers) {
       const lower = name.toLowerCase();
-      if (lower === "set-cookie" || lower === "cookie" || lower === "authorization" || lower === "proxy-authorization") {
+      if (lower === "set-cookie" || lower === "cookie" || lower === "authorization" || lower === "proxy-authorization" || DROPPED_DOCUMENT_HEADERS.has(lower)) {
         continue;
       }
       const existing = headers[lower];
@@ -26227,6 +26340,9 @@ async function startInterceptProxy(options = {}) {
       else if (Array.isArray(existing)) existing.push(value);
       else headers[lower] = [existing, value];
     }
+    for (const [name, value] of proxyDocumentHeaders()) {
+      headers[name] = value;
+    }
     writeResponse(
       res,
       fetched.value.status,
@@ -26296,6 +26412,7 @@ async function startInterceptProxy(options = {}) {
   });
   return {
     endpoint,
+    responseBodyToken,
     setPolicy(next) {
       policy = next;
     },
@@ -26462,7 +26579,7 @@ function createPlatformInterceptionProvider(adapter) {
 var TOKEN_BYTES = 32;
 var TOKEN_LENGTH = 43;
 function createCapabilityState(preset, now) {
-  const bootstrap = randomBytes(TOKEN_BYTES).toString("base64url");
+  const bootstrap = randomBytes2(TOKEN_BYTES).toString("base64url");
   return {
     presetDigest: preset.digest,
     bootstrap,
@@ -26485,15 +26602,15 @@ function isToken(value) {
     return false;
   }
 }
-function sameToken(value, expectedDigest) {
+function sameToken2(value, expectedDigest) {
   const actual = digestToken(value);
-  return actual.length === expectedDigest.length && timingSafeEqual(actual, expectedDigest);
+  return actual.length === expectedDigest.length && timingSafeEqual2(actual, expectedDigest);
 }
 function sameDigest(value, expected) {
   if (!isSha256Digest(value) || value.length !== expected.length) return false;
   const actual = Buffer.from(value, "ascii");
   const wanted = Buffer.from(expected, "ascii");
-  return timingSafeEqual(actual, wanted);
+  return timingSafeEqual2(actual, wanted);
 }
 function cleanSessions(state, now) {
   for (let index = state.sessions.length - 1; index >= 0; index -= 1) {
@@ -26503,14 +26620,14 @@ function cleanSessions(state, now) {
 }
 function pairCapability(state, capability, digest, now) {
   cleanSessions(state, now);
-  if (state.closed || state.consumed || !isToken(capability) || typeof digest !== "string" || !sameDigest(digest, state.presetDigest) || now >= state.bootstrapExpiresAt || !sameToken(capability, state.bootstrapDigest)) {
+  if (state.closed || state.consumed || !isToken(capability) || typeof digest !== "string" || !sameDigest(digest, state.presetDigest) || now >= state.bootstrapExpiresAt || !sameToken2(capability, state.bootstrapDigest)) {
     return failure("runtime.pairing-denied");
   }
   if (state.sessions.length >= RUNTIME_LIMITS.maxConcurrentSessions) {
     return failure("runtime.overloaded");
   }
   state.consumed = true;
-  const sessionCapability = randomBytes(TOKEN_BYTES).toString("base64url");
+  const sessionCapability = randomBytes2(TOKEN_BYTES).toString("base64url");
   const expiresAt = now + RUNTIME_LIMITS.sessionLifetimeMs;
   state.sessions.push({
     digest: Buffer.from(state.presetDigest, "ascii"),
@@ -26533,7 +26650,7 @@ function findSession(state, capability, digest, now) {
   if (!sameDigest(digest, state.presetDigest)) return null;
   const candidate = digestToken(capability);
   for (const session of state.sessions) {
-    if (candidate.length === session.tokenDigest.length && timingSafeEqual(candidate, session.tokenDigest) && sameDigest(digest, session.digest.toString("ascii"))) {
+    if (candidate.length === session.tokenDigest.length && timingSafeEqual2(candidate, session.tokenDigest) && sameDigest(digest, session.digest.toString("ascii"))) {
       return session;
     }
   }
@@ -26649,74 +26766,6 @@ async function pickDirectory(run = runDialog, platform = process.platform) {
   }
   return { ok: false, code: "runtime.picker-unavailable" };
 }
-async function readMockFile(root, logicalPath, signal) {
-  return readConfinedPathBytes(root, logicalPath, signal);
-}
-function mintToken() {
-  return randomBytes2(32).toString("hex");
-}
-function headerName(name) {
-  return name.toLowerCase();
-}
-function waitForDelay(delayMs, signal) {
-  if (signal?.aborted) return Promise.resolve(failure("runtime.timeout"));
-  if (delayMs === void 0 || delayMs <= 0) {
-    return Promise.resolve({ ok: true, value: void 0 });
-  }
-  return new Promise((resolve12) => {
-    const onAbort = () => {
-      clearTimeout(timer);
-      resolve12(failure("runtime.timeout"));
-    };
-    const timer = setTimeout(() => {
-      signal?.removeEventListener("abort", onAbort);
-      resolve12({ ok: true, value: void 0 });
-    }, delayMs);
-    signal?.addEventListener("abort", onAbort, { once: true });
-  });
-}
-async function renderMockResponse(options) {
-  const { mock, fileRoot, method, signal } = options;
-  const waited = await waitForDelay(mock.delayMs, signal);
-  if (!waited.ok) return waited;
-  let fullBytes;
-  if (mock.body !== void 0) {
-    fullBytes = new TextEncoder().encode(mock.body);
-  } else if (mock.file !== void 0) {
-    if (fileRoot === void 0) return failure("runtime.file-denied");
-    if (!isConfinedFileSupported()) {
-      return failure("runtime.platform-unsupported");
-    }
-    const read2 = await readMockFile(fileRoot, mock.file, signal);
-    if (!read2.ok) return read2;
-    fullBytes = read2.value;
-  } else {
-    return failure("runtime.file-denied");
-  }
-  const headers = [];
-  let hasContentType = false;
-  let hasCacheControl = false;
-  for (const header of mock.headers ?? []) {
-    const name = headerName(header.name);
-    if (name === "content-length") continue;
-    if (name === "content-type") hasContentType = true;
-    if (name === "cache-control") hasCacheControl = true;
-    headers.push([header.name, header.value]);
-  }
-  if (!hasContentType) {
-    headers.push(["Content-Type", "application/octet-stream"]);
-  }
-  headers.push(["Content-Length", String(fullBytes.byteLength)]);
-  if (!hasCacheControl) headers.push(["Cache-Control", "no-store"]);
-  return {
-    ok: true,
-    value: {
-      status: mock.status,
-      headers,
-      bodyBytes: method === "HEAD" ? new Uint8Array() : fullBytes
-    }
-  };
-}
 var MAX_MOCK_FILE_ERRORS = 64;
 var FILE_ERROR_CODES = /* @__PURE__ */ new Set([
   "runtime.file-denied",
@@ -28171,7 +28220,10 @@ function createNativeHost(options) {
           signal: request.signal
         })
       });
-      return interceptProxy.endpoint;
+      return {
+        ...interceptProxy.endpoint,
+        responseBodyToken: interceptProxy.responseBodyToken
+      };
     },
     async stopTlsProxy() {
       if (interceptProxy) {
@@ -29792,7 +29844,7 @@ function createServer3(handler, options = {}) {
 }
 
 // packages/cli/src/server/routes.ts
-import { randomBytes as randomBytes4, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
+import { randomBytes as randomBytes4, timingSafeEqual as timingSafeEqual3 } from "node:crypto";
 import { readFile as readFile4 } from "node:fs/promises";
 import { dirname as dirname9, isAbsolute as isAbsolute5, resolve as resolve5 } from "node:path";
 
@@ -30261,7 +30313,7 @@ function tokensEqual(provided, expected) {
   const providedBytes = Buffer.from(provided);
   const expectedBytes = Buffer.from(expected);
   if (providedBytes.length !== expectedBytes.length) return false;
-  return timingSafeEqual2(providedBytes, expectedBytes);
+  return timingSafeEqual3(providedBytes, expectedBytes);
 }
 function scopedPathname(pathname, sessionToken) {
   const marker = "/e/";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rogatio/cli",
-  "version": "6.21.0",
+  "version": "6.21.1",
   "private": false,
   "type": "module",
   "description": "Local-first browser request and response rules — editor host, file verification, test runner, and runtime dispatch.",