@dutodev/cli 1.5.0 → 1.6.1

package/README.md

@@ -91,7 +91,39 @@ Ways out, from simplest to most work:
 
 In every case, register `https://<name>-<user>.duto.dev/<callback path>` as the callback URL at the provider. The comparison is usually exact, with no wildcards: each person on the team has their own address.
 
-**About `X-Forwarded-*`.** `X-Forwarded-Host`, `X-Forwarded-Proto` and `X-Forwarded-For` are an old convention between reverse proxies for telling the app what the client actually asked for. The standard version is the `Forwarded` header (RFC 7239), which is less used in practice. Frameworks usually read these headers only when the proxy is marked as trusted (`trusted proxies`, `trust proxy`, `USE_X_FORWARDED_HOST`), so what `headers:` does depends on how your app is configured. On the other hand, if an app reads `X-Forwarded-Host` without that check, any client can forge it in production. Make sure the proxy in front overwrites or removes that header.
+**What you cannot set.** Some headers belong to Cloudflare, to Duto or to the HTTP connection itself. `duto.yml` refuses them, with the line and what to do:
+
+| Headers | Who sets them | In `headers:` |
+|---|---|---|
+| `CF-*` (`CF-Connecting-IP`, `CF-IPCountry`, `CF-Ray`) | Cloudflare | error |
+| `X-Forwarded-For` | Cloudflare: the client IP | error |
+| `X-Duto-*` | Duto | error; never reaches your app |
+| `Content-Length`, `Transfer-Encoding`, `Connection`, `Keep-Alive`, `Upgrade`, `Expect`, `TE`, `Trailer`, `Proxy-Connection` | Duto, per connection | error |
+| `Host` | `host:` | error, use `host:` |
+| `X-Forwarded-Host`, `-Proto`, `-Port`, `-Prefix` | you | replaces the value; `""` removes it |
+| everything else | you | replaces the value; `""` removes it |
+
+Values must be ASCII or Latin-1 text. `${VAR}` reads from an environment variable, so tokens stay out of git:
+
+```yaml
+headers:
+  Authorization: Bearer ${API_TOKEN}
+```
+
+If a tunnel without `auth:` injects a credential (`Authorization`, `Cookie`, `X-Api-Key`, `*-Token`…), the CLI warns at start: anyone with the URL is signed in as that credential.
+
+**Forged `X-Forwarded-*`.** Cloudflare sets `X-Forwarded-Proto` and `X-Forwarded-For`, but nobody sets `X-Forwarded-Host`, `X-Forwarded-Port` or `X-Forwarded-Prefix`: any value that arrives was written by the client. Duto removes those three by default, so an app that trusts them cannot be fooled. When a reverse proxy you trust sits in front of the tunnel (a Vercel rewrite, a staging nginx, a company gateway), or when you test with `curl -H 'X-Forwarded-Host: acme.test'`, let them through:
+
+```yaml
+tunnels:
+  shop:
+    port: 8080
+    trust_forwarded: true
+```
+
+Values in `headers:` always win. With `host:`, `X-Forwarded-Host` is still not sent.
+
+**About `X-Forwarded-*`.** These headers are an old convention between reverse proxies for telling the app what the client actually asked for. The standard version is the `Forwarded` header (RFC 7239), which is less used in practice. Frameworks usually read them only when the proxy is marked as trusted (`trusted proxies`, `trust proxy`, `USE_X_FORWARDED_HOST`), so what `headers:` does depends on how your app is configured.
 
 ## Password-protect a tunnel
 
@@ -166,7 +198,8 @@ With every session, the CLI starts a local inspector: a browser page with reques
 - **Issues.** The inspector flags what usually breaks a tunnel: nothing listening on the port, a redirect to `localhost` or down to `http`, a cookie the browser drops (`Domain` mismatch, `SameSite=None` without `Secure`), a CORS response or preflight the browser blocks, and response bodies that link to `localhost`. Each one says what to change.
 - **Flows.** A redirect is linked to the request the same browser made next, so a login or OAuth round trip reads as one chain you can step through.
 - **Filters.** Type terms like `status:4xx`, `status:>=500`, `method:post`, `path:/api`, `is:redirect`, `is:issue`, `is:duto` or `duration:>500ms`. Start a term with `-` to exclude it. The buttons under the filter (Errors, Redirects, Issues, Slow) apply the common ones.
-- **Clear and export.** Clear hides what is already listed, so you can reproduce a flow from a clean list. Export HAR saves the listed requests for Chrome DevTools or any HAR viewer.
+- **Changed by Duto.** Each request lists what Duto changed before your app got it, and why: headers from `headers:`, the Host from `host:`, forged `X-Forwarded-*` from the client, Duto's own credentials, the rewritten `Location` and how the tunnel password let it in. The headers shown are the ones your app received.
+- **Clear and export.** Clear hides what is already listed, so you can reproduce a flow from a clean list. Export HAR saves the listed requests for Chrome DevTools or any HAR viewer. Values that came from `headers:` are masked in the HAR (`••• (duto.yml)`), so you can share it.
 - **How to open it.** In the full screen, key `i` opens the browser at the right address, and the screen shows `inspector  http://127.0.0.1:<port>`. In plain mode (pipe, CI, `--no-ui`), the CLI prints `inspector: <url>?t=<token>`; copy that whole address.
 - **Port.** The default is `127.0.0.1:4141`. If it is taken, the CLI tries the next ones up to 4161 and then any free port. The inspector listens on `127.0.0.1` only: other machines on your network cannot reach it.
 - **Token.** The address carries a session token (`?t=...`). It exists so other sites open in your browser cannot read or replay your requests. That is why the full screen does not show the token; use key `i`.

package/dist/{chunk-4SIBC52A.js → chunk-DUC4RSBW.js}

@@ -408,6 +408,41 @@ function compareVersions(a, b) {
   return 0;
 }
 
+// ../shared/src/headers.ts
+var FRAMING_HEADERS = ["content-length", "transfer-encoding", "connection", "keep-alive", "upgrade", "expect", "te", "trailer", "proxy-connection"];
+var FORWARDED_ADDRESS_HEADERS = ["x-forwarded-host", "x-forwarded-proto", "x-forwarded-port", "x-forwarded-prefix"];
+var UNTRUSTED_VISITOR_HEADERS = ["x-forwarded-host", "x-forwarded-port", "x-forwarded-prefix"];
+var CREDENTIAL_NAMES = ["authorization", "cookie", "proxy-authorization", "x-forwarded-user", "remote-user", "x-remote-user"];
+var CREDENTIAL_SUFFIXES = ["-token", "-api-key", "-apikey", "-secret"];
+var VALID_VALUE = /^[\t\x20-\x7e\x80-\xff]*$/;
+function headerGroup(name) {
+  const n = name.toLowerCase();
+  if (n.startsWith("cf-")) return "cloudflare";
+  if (n.startsWith("x-duto-")) return "duto";
+  if (FRAMING_HEADERS.includes(n)) return "framing";
+  if (n === "host") return "host";
+  if (n === "x-forwarded-for") return "client-ip";
+  if (FORWARDED_ADDRESS_HEADERS.includes(n)) return "forwarded-address";
+  return "other";
+}
+var RESERVED_REASONS = {
+  cloudflare: "is set by Cloudflare",
+  duto: "is reserved for Duto",
+  framing: "is set by Duto",
+  "client-ip": "carries the client IP and is set by Cloudflare"
+};
+function reservedHeaderError(name) {
+  const reason = RESERVED_REASONS[headerGroup(name)];
+  return reason ? `${name} ${reason}. Remove it from headers.` : null;
+}
+function isValidHeaderValue(value) {
+  return VALID_VALUE.test(value);
+}
+function isCredentialLike(name) {
+  const n = name.toLowerCase();
+  return CREDENTIAL_NAMES.includes(n) || CREDENTIAL_SUFFIXES.some((s) => n.endsWith(s));
+}
+
 // src/config.ts
 import { randomUUID } from "crypto";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -489,6 +524,26 @@ function updateLine(latest) {
   return `duto ${latest} is available. Update: ${CLI_UPDATE_COMMAND}`;
 }
 
+// src/inspector/changes.ts
+var SIGNS = { add: "+", replace: "~", remove: "\u2212" };
+function headerLabel(name) {
+  return name.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("-");
+}
+function reasonOf(c) {
+  if (c.source === "headers") return c.kind === "remove" ? 'headers: ""' : "headers:";
+  if (c.source === "host") return "host:";
+  if (c.source === "visitor") return "from the visitor; set trust_forwarded: true to keep it";
+  return "Duto credential";
+}
+function valueOf(c) {
+  if (c.kind === "replace") return `${c.from ?? ""} \u2192 ${c.to ?? ""}`;
+  return (c.kind === "add" ? c.to : c.from) ?? "";
+}
+function describeChange(c) {
+  const sign = c.kind === "replace" && c.source === "host" ? " " : SIGNS[c.kind];
+  return { label: `${sign} ${headerLabel(c.name)}`, value: valueOf(c), reason: reasonOf(c) };
+}
+
 // src/ui/theme.ts
 var C = {
   signal: "#2dd4bf",
@@ -552,10 +607,17 @@ export {
   placeOf,
   CLI_VERSION_HEADER,
   CLI_USER_AGENT,
+  FRAMING_HEADERS,
+  UNTRUSTED_VISITOR_HEADERS,
+  reservedHeaderError,
+  isValidHeaderValue,
+  isCredentialLike,
   dutoHome,
   apiUrl,
   saveConfig,
   loadConfig,
+  headerLabel,
+  describeChange,
   C,
   tunnelColor,
   fit,

package/dist/{fullscreen-MZMQ6ADN.js → fullscreen-MSVJF43W.js}

@@ -4,6 +4,7 @@ import {
   MAX_NAME,
   TRUNCATED_NOTE,
   bodyNote,
+  describeChange,
   fit,
   formatBytes,
   formatDuration,
@@ -14,7 +15,7 @@ import {
   tunnelColor,
   updateLine,
   validateName
-} from "./chunk-4SIBC52A.js";
+} from "./chunk-DUC4RSBW.js";
 
 // src/ui/fullscreen.tsx
 import { render } from "ink";
@@ -87,6 +88,18 @@ function Detail({ record }) {
         record.redirect.to
       ] })
     ] }),
+    record.headerChanges && record.headerChanges.length > 0 && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ jsx(Text, { color: C.signal, children: "Changed by Duto" }),
+      record.headerChanges.map(describeChange).map((c, i) => /* @__PURE__ */ jsxs(Text, { wrap: "truncate-end", children: [
+        c.label,
+        " ",
+        c.value,
+        /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
+          "  ",
+          c.reason
+        ] })
+      ] }, i))
+    ] }),
     /* @__PURE__ */ jsx(Section, { title: "Request", headers: record.reqHeaders, body: record.reqBody, truncated: record.reqTruncated, note: bodyNote(record, "req") }),
     /* @__PURE__ */ jsx(Section, { title: "Response", headers: record.resHeaders, body: record.resBody, truncated: record.resTruncated, note: bodyNote(record, "res") }),
     /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
@@ -299,7 +312,11 @@ var KEYS = [
   ["tab", "focus"],
   ["q", "quit"]
 ];
-function App({ session, version, system, onExit, inspector = null, inspectorError, update = null }) {
+function startupMessage(inspectorError, warnings) {
+  const lines = [...inspectorError ? [`Inspector failed to start: ${inspectorError}`] : [], ...warnings];
+  return lines.length ? { text: lines.join("  "), tone: "warn" } : null;
+}
+function App({ session, version, system, onExit, inspector = null, inspectorError, warnings = [], update = null }) {
   const subState = useCallback((fn) => session.subscribe(fn), [session]);
   const subRecords = useCallback((fn) => session.records.subscribe(fn), [session]);
   const state = useSyncExternalStore(subState, () => session.getState());
@@ -312,7 +329,7 @@ function App({ session, version, system, onExit, inspector = null, inspectorErro
   const [focus, setFocus] = useState("requests");
   const [selReq, setSelReq] = useState(0);
   const [selTun, setSelTun] = useState(0);
-  const [message, setMessage] = useState(inspectorError ? { text: `Inspector failed to start: ${inspectorError}`, tone: "warn" } : null);
+  const [message, setMessage] = useState(() => startupMessage(inspectorError, warnings));
   const [now, setNow] = useState(() => Date.now());
   const quitting = useRef(false);
   const records = useMemo(() => {
@@ -564,7 +581,7 @@ var realSystem = {
 
 // src/ui/fullscreen.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
-function runFullscreen(session, specs, version, inspector, inspectorError, update = Promise.resolve(null)) {
+function runFullscreen(session, specs, version, inspector, inspectorError, update = Promise.resolve(null), warnings = []) {
   return withFullscreen(
     process.stdout,
     (signal) => new Promise((resolve) => {
@@ -575,7 +592,7 @@ function runFullscreen(session, specs, version, inspector, inspectorError, updat
         app.unmount();
         resolve(code);
       };
-      const view = (latest) => /* @__PURE__ */ jsx7(App, { session, version, system: realSystem, inspector, inspectorError, update: latest, onExit: () => finish(0) });
+      const view = (latest) => /* @__PURE__ */ jsx7(App, { session, version, system: realSystem, inspector, inspectorError, warnings, update: latest, onExit: () => finish(0) });
       const app = render(view(null), { exitOnCtrlC: false });
       void update.then((latest) => {
         if (latest && !done) app.rerender(view(latest));

package/dist/index.js

@@ -3,24 +3,31 @@ import {
   C,
   CLI_USER_AGENT,
   CLI_VERSION_HEADER,
+  FRAMING_HEADERS,
   MAX_NAME,
   TRUNCATED_NOTE,
+  UNTRUSTED_VISITOR_HEADERS,
   apiUrl,
   bodyNote,
   checkForUpdate,
+  describeChange,
   dutoHome,
   formatBytes,
   formatDuration,
   formatTime,
+  headerLabel,
+  isCredentialLike,
+  isValidHeaderValue,
   loadConfig,
   localLabel,
   normalizeName,
   placeOf,
+  reservedHeaderError,
   saveConfig,
   statusColor,
   updateLine,
   validateName
-} from "./chunk-4SIBC52A.js";
+} from "./chunk-DUC4RSBW.js";
 
 // src/ui/brand.ts
 function colorOn(stream = process.stdout) {
@@ -36,8 +43,8 @@ var SGR = {
   warn: "38;2;250;204;21",
   err: "38;2;248;113;113"
 };
-function paint(tone, text, stream) {
-  return colorOn(stream) ? `\x1B[${SGR[tone]}m${text}\x1B[0m` : text;
+function paint(tone, text2, stream) {
+  return colorOn(stream) ? `\x1B[${SGR[tone]}m${text2}\x1B[0m` : text2;
 }
 var mark = () => `${paint("signal", "\u25B0")} ${paint("strong", "duto")}`;
 var ok = (msg) => `${paint("signal", "\u2714")} ${msg}`;
@@ -50,7 +57,7 @@ import { join as join5, relative } from "path";
 import cac from "cac";
 
 // src/version.ts
-var CLI_VERSION = "1.5.0";
+var CLI_VERSION = "1.6.1";
 
 // src/api.ts
 var DutoApiError = class extends Error {
@@ -368,7 +375,7 @@ var CONFIG_FILES = ["duto.yml", "duto.yaml"];
 var LABEL = "[a-z0-9](?:[a-z0-9-]*[a-z0-9])?";
 var HOST_RE = new RegExp(`^${LABEL}(?:\\.${LABEL})*(?::\\d{1,5})?$`);
 var HEADER_NAME_RE = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
-var TUNNEL_KEYS = ["port", "host", "headers", "rewrite_redirects", "auth", "allow"];
+var TUNNEL_KEYS = ["port", "host", "headers", "rewrite_redirects", "trust_forwarded", "auth", "allow"];
 var ENV_REF_RE = /\$\{([A-Z_0-9]+)\}/g;
 function parseHost(raw) {
   const host = raw.trim().toLowerCase();
@@ -383,14 +390,29 @@ function parseCredential(raw) {
   if (password.length < 8 || password.length > 128) return { ok: false, reason: "password" };
   return { ok: true, cred: { user, password } };
 }
+function expandEnv(text2, env, missing) {
+  return text2.replace(ENV_REF_RE, (_m, name) => {
+    const val = env[name];
+    if (val === void 0) throw missing(name);
+    return val;
+  });
+}
+function headerText(node) {
+  if (node === null) return "";
+  if (!isScalar(node)) return void 0;
+  if (node.value === null) return "";
+  if (typeof node.value === "string") return node.value;
+  if (typeof node.value === "number" || typeof node.value === "boolean") return node.source ?? String(node.value);
+  return void 0;
+}
 function portOf(value) {
   const v = isMap(value) ? value.get("port") : isScalar(value) ? value.value : value;
   return typeof v === "number" && Number.isInteger(v) && v >= 1 && v <= 65535 ? v : null;
 }
-function parseConfig(text, file = CONFIG_FILES[0], env = process.env) {
+function parseConfig(text2, file = CONFIG_FILES[0], env = process.env) {
   const fail3 = (message2, line) => new ConfigError(message2, line, file);
   const lc = new LineCounter();
-  const doc = parseDocument(text, { lineCounter: lc, prettyErrors: false });
+  const doc = parseDocument(text2, { lineCounter: lc, prettyErrors: false });
   const lineAt = (offset) => offset === void 0 ? void 0 : lc.linePos(offset).line;
   if (doc.errors.length) {
     const e = doc.errors[0];
@@ -419,7 +441,7 @@ function parseConfig(text, file = CONFIG_FILES[0], env = process.env) {
       const body = pair2.value;
       for (const item of body.items) {
         const key = isScalar(item.key) ? String(item.key.value) : "";
-        if (!TUNNEL_KEYS.includes(key)) throw fail3(`unknown key in "${raw}": ${key} (use port, host, headers, rewrite_redirects, auth or allow)`, line);
+        if (!TUNNEL_KEYS.includes(key)) throw fail3(`unknown key in "${raw}": ${key} (use port, host, headers, rewrite_redirects, trust_forwarded, auth or allow)`, line);
       }
       const hostNode = body.get("host", true);
       if (hostNode !== void 0) {
@@ -430,21 +452,22 @@ function parseConfig(text, file = CONFIG_FILES[0], env = process.env) {
       const headersNode = body.get("headers", true);
       if (headersNode !== void 0) {
         if (!isMap(headersNode)) throw fail3(`headers in "${raw}" must be a list of Name: value`, line);
-        const headers = {};
+        const headers = /* @__PURE__ */ new Map();
         for (const h of headersNode.items) {
           const hName = isScalar(h.key) ? String(h.key.value) : "";
           const hLine = lineAt(h.key?.range?.[0]);
-          if (!HEADER_NAME_RE.test(hName)) throw fail3(`invalid header in "${raw}": "${hName}"`, hLine);
+          if (!HEADER_NAME_RE.test(hName) || hName === "__proto__") throw fail3(`invalid header in "${raw}": "${hName}"`, hLine);
           if (hName.toLowerCase() === "host") throw fail3(`to change the Host of "${raw}", use host: instead of headers`, hLine);
-          const value = h.value === null ? null : isScalar(h.value) ? h.value.value : void 0;
-          if (value !== null && !["string", "number", "boolean"].includes(typeof value)) {
-            throw fail3(`invalid value for header "${hName}" in "${raw}"`, hLine);
-          }
-          const str = value === null ? "" : String(value);
-          if (/[\r\n]/.test(str)) throw fail3(`invalid value for header "${hName}" in "${raw}"`, hLine);
-          headers[hName.toLowerCase()] = str;
+          const reserved = reservedHeaderError(hName);
+          if (reserved) throw fail3(reserved, hLine);
+          if (headers.has(hName.toLowerCase())) throw fail3(`header ${hName} appears twice in "${raw}"`, hLine);
+          const text3 = headerText(h.value);
+          if (text3 === void 0) throw fail3(`invalid value for header "${hName}" in "${raw}"`, hLine);
+          const value = expandEnv(text3, env, (name2) => fail3(`environment variable ${name2} is not set (used in headers of "${raw}")`, hLine));
+          if (!isValidHeaderValue(value)) throw fail3(`invalid character in the value of ${hName} in "${raw}". Use ASCII or Latin-1 text.`, hLine);
+          headers.set(hName.toLowerCase(), value);
         }
-        spec.headers = headers;
+        spec.headers = Object.fromEntries(headers);
       }
       const rewriteNode = body.get("rewrite_redirects", true);
       if (rewriteNode !== void 0) {
@@ -453,19 +476,21 @@ function parseConfig(text, file = CONFIG_FILES[0], env = process.env) {
         if (!spec.host) throw fail3(`rewrite_redirects in "${raw}" only works together with host:`, line);
         if (value === false) spec.rewriteRedirects = false;
       }
+      const trustNode = body.get("trust_forwarded", true);
+      if (trustNode !== void 0) {
+        const value = isScalar(trustNode) ? trustNode.value : void 0;
+        if (typeof value !== "boolean") throw fail3(`trust_forwarded in "${raw}" must be true or false`, line);
+        if (value) spec.trustForwarded = true;
+      }
       const authNode = body.get("auth", true);
       if (authNode !== void 0) {
         if (!isSeq(authNode)) throw fail3(`auth in "${raw}" must be a list of user:password`, line);
         const auth = [];
         for (const item of authNode.items) {
           const iLine = lineAt(item.range?.[0]) ?? line;
-          const text2 = isScalar(item) && typeof item.value === "string" ? item.value : null;
-          if (text2 === null) throw fail3(`invalid credential in "${raw}": use user:password`, iLine);
-          const expanded = text2.replace(ENV_REF_RE, (_m, name2) => {
-            const val = env[name2];
-            if (val === void 0) throw fail3(`environment variable ${name2} is not set (used in auth of "${raw}")`, iLine);
-            return val;
-          });
+          const text3 = isScalar(item) && typeof item.value === "string" ? item.value : null;
+          if (text3 === null) throw fail3(`invalid credential in "${raw}": use user:password`, iLine);
+          const expanded = expandEnv(text3, env, (name2) => fail3(`environment variable ${name2} is not set (used in auth of "${raw}")`, iLine));
           const parsed = parseCredential(expanded);
           if (!parsed.ok) {
             if (parsed.reason === "format") throw fail3(`invalid credential in "${raw}": use user:password`, iLine);
@@ -513,6 +538,19 @@ function findConfig(cwd) {
   }
 }
 
+// src/session/warnings.ts
+function joinNames(names) {
+  return names.length < 2 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${names.at(-1)}`;
+}
+function credentialWarnings(specs) {
+  return specs.flatMap((spec) => {
+    if (spec.auth?.length) return [];
+    const names = Object.entries(spec.headers ?? {}).filter(([name, value]) => value !== "" && isCredentialLike(name)).map(([name]) => headerLabel(name));
+    if (!names.length) return [];
+    return [`${spec.name ?? `localhost:${spec.port}`} injects ${joinNames(names)} and has no auth: anyone with the URL is signed in.`];
+  });
+}
+
 // src/login.ts
 import { spawn } from "child_process";
 import { hostname } from "os";
@@ -523,7 +561,7 @@ async function browserLogin(o) {
   const start = await api.startLogin({
     deviceId: o.deviceId,
     deviceName: hostname(),
-    cliVersion: "1.5.0",
+    cliVersion: "1.6.1",
     nodeVersion: process.version,
     os: process.platform,
     arch: process.arch
@@ -616,7 +654,7 @@ function edgeLabel(edge) {
 }
 
 // src/inspector/filter.ts
-function matchesFilter(item, text) {
+function matchesFilter(item, text2) {
   function compare(value, spec, unit) {
     const m = /^(>=|<=|>|<|=)?(.+)$/.exec(spec);
     if (!m) return null;
@@ -668,7 +706,7 @@ function matchesFilter(item, text) {
     return null;
   }
   const haystack = [item.tunnel, item.websocket ? "ws" : item.method, item.path, item.status === null ? "" : String(item.status), item.client ?? ""].join(" ").toLowerCase();
-  const terms = text.trim().split(/\s+/).filter(Boolean);
+  const terms = text2.trim().split(/\s+/).filter(Boolean);
   for (const raw of terms) {
     const negate = raw.length > 1 && raw.charAt(0) === "-";
     const term = negate ? raw.slice(1) : raw;
@@ -684,9 +722,9 @@ function matchesFilter(item, text) {
 function countLabel(n, one, many) {
   return n + " " + (n === 1 ? one : many);
 }
-function jsonSyntaxError(text) {
+function jsonSyntaxError(text2) {
   try {
-    JSON.parse(text);
+    JSON.parse(text2);
     return null;
   } catch (e) {
     const message2 = String(e && e.message ? e.message : e);
@@ -696,65 +734,65 @@ function jsonSyntaxError(text) {
     if (lc) {
       let idx = 0;
       for (let ln = 1; ln < Number(lc[1]); ln++) {
-        const nl = text.indexOf("\n", idx);
-        if (nl < 0) return { position: text.length, message: message2 };
+        const nl = text2.indexOf("\n", idx);
+        if (nl < 0) return { position: text2.length, message: message2 };
         idx = nl + 1;
       }
-      return { position: Math.min(idx + Number(lc[2]) - 1, text.length), message: message2 };
+      return { position: Math.min(idx + Number(lc[2]) - 1, text2.length), message: message2 };
     }
-    return { position: text.length, message: message2 };
+    return { position: text2.length, message: message2 };
   }
 }
-function jsonTokens(text) {
+function jsonTokens(text2) {
   const out = [];
   let depth = 0;
   let i = 0;
-  while (i < text.length) {
-    const c = text.charAt(i);
+  while (i < text2.length) {
+    const c = text2.charAt(i);
     let j = i + 1;
     let kind;
     if (c === " " || c === "\n" || c === "	" || c === "\r") {
-      while (j < text.length && " \n	\r".indexOf(text.charAt(j)) >= 0) j++;
+      while (j < text2.length && " \n	\r".indexOf(text2.charAt(j)) >= 0) j++;
       kind = "space";
     } else if (c === '"') {
-      while (j < text.length && text.charAt(j) !== '"') j += text.charAt(j) === "\\" ? 2 : 1;
-      j = Math.min(j + 1, text.length);
+      while (j < text2.length && text2.charAt(j) !== '"') j += text2.charAt(j) === "\\" ? 2 : 1;
+      j = Math.min(j + 1, text2.length);
       let k = j;
-      while (k < text.length && " \n	\r".indexOf(text.charAt(k)) >= 0) k++;
-      kind = text.charAt(k) === ":" ? "key" : "string";
+      while (k < text2.length && " \n	\r".indexOf(text2.charAt(k)) >= 0) k++;
+      kind = text2.charAt(k) === ":" ? "key" : "string";
     } else if ("{}[],:".indexOf(c) >= 0) {
       kind = "punct";
       if (c === "}" || c === "]") depth = Math.max(0, depth - 1);
     } else {
-      while (j < text.length && ' \n	\r{}[],:"'.indexOf(text.charAt(j)) < 0) j++;
-      const word = text.slice(i, j);
+      while (j < text2.length && ' \n	\r{}[],:"'.indexOf(text2.charAt(j)) < 0) j++;
+      const word = text2.slice(i, j);
       kind = word === "true" || word === "false" || word === "null" ? "literal" : "number";
     }
-    out.push({ kind, text: text.slice(i, j), depth });
+    out.push({ kind, text: text2.slice(i, j), depth });
     if (kind === "punct" && (c === "{" || c === "[")) depth++;
     i = j;
   }
   return out;
 }
-function jsonIndent(text) {
+function jsonIndent(text2) {
   let out = "";
   let depth = 0;
   let i = 0;
   const ws = " \n	\r";
-  while (i < text.length) {
-    const c = text.charAt(i);
+  while (i < text2.length) {
+    const c = text2.charAt(i);
     if (ws.indexOf(c) >= 0) {
       i++;
     } else if (c === '"') {
       let j = i + 1;
-      while (j < text.length && text.charAt(j) !== '"') j += text.charAt(j) === "\\" ? 2 : 1;
-      out += text.slice(i, j + 1);
+      while (j < text2.length && text2.charAt(j) !== '"') j += text2.charAt(j) === "\\" ? 2 : 1;
+      out += text2.slice(i, j + 1);
       i = j + 1;
     } else if (c === "{" || c === "[") {
       let j = i + 1;
-      while (j < text.length && ws.indexOf(text.charAt(j)) >= 0) j++;
-      if (text.charAt(j) === (c === "{" ? "}" : "]")) {
-        out += c + text.charAt(j);
+      while (j < text2.length && ws.indexOf(text2.charAt(j)) >= 0) j++;
+      if (text2.charAt(j) === (c === "{" ? "}" : "]")) {
+        out += c + text2.charAt(j);
         i = j + 1;
       } else {
         depth++;
@@ -773,8 +811,8 @@ function jsonIndent(text) {
       i++;
     } else {
       let j = i + 1;
-      while (j < text.length && (ws + '{}[],:"').indexOf(text.charAt(j)) < 0) j++;
-      out += text.slice(i, j);
+      while (j < text2.length && (ws + '{}[],:"').indexOf(text2.charAt(j)) < 0) j++;
+      out += text2.slice(i, j);
       i = j;
     }
   }
@@ -1225,16 +1263,21 @@ function renderOverview(box, d) {
     ["Total time", timing],
     ["First byte", d.ttfbMs === undefined ? null : d.ttfbMs + " ms"],
     ["Size", d.status === null ? null : size(d.bytes)],
-    ["Data center", d.edge ? edgeLabel(d.edge).replace(/^via /, "") : null],
-    ["Access", accessText(d.access)]
+    ["Data center", d.edge ? edgeLabel(d.edge).replace(/^via /, "") : null]
   ]));
 
+  var changes = (d.changes || []).map(function (c) { return [c.label, c.value + " · " + c.reason]; });
+  if (changes.length > 0 || d.redirect || d.access) {
+    ov.appendChild(el("div", "sect", "Changed by Duto"));
+    ov.appendChild(rows(changes.concat([
+      ["Location rewritten", d.redirect ? d.redirect.from + " → " + d.redirect.to : null],
+      ["Access", accessText(d.access)]
+    ])));
+  }
+
   if (d.location || d.redirect) {
     ov.appendChild(el("div", "sect", "Redirect"));
-    ov.appendChild(rows([
-      ["Location", d.location || (d.redirect && d.redirect.to)],
-      ["Location rewritten", d.redirect ? d.redirect.from + " → " + d.redirect.to : null]
-    ]));
+    ov.appendChild(rows([["Location", d.location || (d.redirect && d.redirect.to)]]));
   }
 
   ov.appendChild(el("div", "sect", "Client"));
@@ -1590,7 +1633,7 @@ function replayBlock(r) {
   if (r.reqBodyBytes > 0 && r.reqRaw === null) return "Binary body is not stored; cannot replay.";
   return null;
 }
-var HOP_BY_HOP_AND_BODY_HEADERS = /* @__PURE__ */ new Set(["connection", "keep-alive", "transfer-encoding", "expect", "content-length", "upgrade", "te", "trailer", "proxy-connection"]);
+var HOP_BY_HOP_AND_BODY_HEADERS = new Set(FRAMING_HEADERS);
 function replayHeaders(r) {
   const out = {};
   for (const [k, v] of Object.entries(r.reqHeaders)) if (!HOP_BY_HOP_AND_BODY_HEADERS.has(k.toLowerCase())) out[k] = v;
@@ -1619,7 +1662,7 @@ function parseCookieHeader(header) {
 }
 
 // src/inspector/curl.ts
-var SKIP = /* @__PURE__ */ new Set(["host", "content-length", "transfer-encoding", "connection", "keep-alive", "expect", "upgrade", "te", "trailer", "proxy-connection"]);
+var SKIP = /* @__PURE__ */ new Set(["host", ...FRAMING_HEADERS]);
 var TUNNEL_ADDED = /* @__PURE__ */ new Set(["cdn-loop", "x-forwarded-for", "x-forwarded-proto", "x-real-ip", "true-client-ip"]);
 var skip = (name) => {
   const k = name.toLowerCase();
@@ -1706,9 +1749,12 @@ function cookieIssues(r, ctx) {
   }
   return out;
 }
+function isPublicOrigin(origin, publicHost) {
+  return publicHost !== null && absoluteUrl(origin)?.host === publicHost.toLowerCase();
+}
 function corsIssues(r, ctx) {
   const origin = r.reqHeaders.origin;
-  if (!origin || r.status === null || ctx.publicHost && origin.toLowerCase() === `https://${ctx.publicHost}`) return [];
+  if (!origin || r.status === null || r.websocket || isPublicOrigin(origin, ctx.publicHost)) return [];
   const allowed = r.resHeaders["access-control-allow-origin"];
   const ok2 = allowed === "*" || allowed === origin;
   const wanted = r.reqHeaders["access-control-request-method"];
@@ -1783,6 +1829,11 @@ function flowChain(id, links) {
 
 // src/inspector/har.ts
 var HTTP = "HTTP/1.1";
+var HAR_MASK = "\u2022\u2022\u2022 (duto.yml)";
+function maskedNames(r) {
+  return new Set((r.headerChanges ?? []).filter((c) => c.source === "headers" && c.kind !== "remove").map((c) => c.name));
+}
+var masked = (list, names) => list.map((h) => names.has(h.name.toLowerCase()) ? { ...h, value: HAR_MASK } : h);
 var headerList = (h) => Object.entries(h).map(([name, value]) => ({ name, value }));
 function harCookie(line) {
   const c = parseSetCookie(line);
@@ -1800,6 +1851,8 @@ function entry(r, publicUrl) {
   const time = r.durationMs ?? 0;
   const wait = Math.min(r.ttfbMs ?? time, time);
   const reqType = r.reqHeaders["content-type"] ?? "";
+  const secret = maskedNames(r);
+  const cookies = parseCookieHeader(r.reqHeaders.cookie ?? "");
   return {
     startedDateTime: new Date(r.startedAt).toISOString(),
     time,
@@ -1807,9 +1860,9 @@ function entry(r, publicUrl) {
       method: r.websocket ? "GET" : r.method,
       url: url.toString(),
       httpVersion: HTTP,
-      headers: headerList(r.reqHeaders),
+      headers: masked(headerList(r.reqHeaders), secret),
       queryString: [...url.searchParams].map(([name, value]) => ({ name, value })),
-      cookies: parseCookieHeader(r.reqHeaders.cookie ?? ""),
+      cookies: secret.has("cookie") ? cookies.map((c) => ({ ...c, value: HAR_MASK })) : cookies,
       headersSize: -1,
       bodySize: r.reqBodyBytes,
       ...r.reqBody !== null && { postData: { mimeType: reqType, text: r.reqBody } }
@@ -1920,6 +1973,7 @@ function detail(r, session, view) {
     ...listItem(r, view),
     edge: edgeOf(r.reqHeaders),
     redirect: r.redirect ?? null,
+    changes: (r.headerChanges ?? []).map(describeChange),
     issues: diagnose(r, view.context(r.tunnel)),
     client: { ip: clientOf(r), country: r.reqHeaders["cf-ipcountry"] ?? null, userAgent: r.reqHeaders["user-agent"] ?? null },
     query: queryOf(r.path),
@@ -1979,7 +2033,7 @@ data: ${JSON.stringify({ ids })}
     res.setHeader("Referrer-Policy", "no-referrer");
     res.setHeader("X-Frame-Options", "DENY");
   };
-  const text = (res, status, body) => {
+  const text2 = (res, status, body) => {
     res.writeHead(status, { "Content-Type": "text/plain; charset=utf-8" });
     res.end(body);
   };
@@ -1990,19 +2044,19 @@ data: ${JSON.stringify({ ids })}
   const handle = (req, res) => {
     base(res);
     const host = first(req.headers.host)?.toLowerCase();
-    if (host !== `127.0.0.1:${port}` && host !== `localhost:${port}`) return text(res, 403, "Host not allowed.");
+    if (host !== `127.0.0.1:${port}` && host !== `localhost:${port}`) return text2(res, 403, "Host not allowed.");
     let url2;
     try {
       url2 = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
     } catch {
-      return text(res, 404, "Not found.");
+      return text2(res, 404, "Not found.");
     }
     const path = url2.pathname;
     const method = req.method ?? "GET";
     const queryToken = url2.searchParams.get("t") ?? "";
     const headerToken = first(req.headers["x-duto-inspector"]) ?? "";
     if (method === "GET" && path === "/") {
-      if (!constantTimeEqual(queryToken, token)) return text(res, 403, NO_TOKEN);
+      if (!constantTimeEqual(queryToken, token)) return text2(res, 403, NO_TOKEN);
       const nonce = randomBytes(16).toString("base64url");
       res.writeHead(200, {
         "Content-Type": "text/html; charset=utf-8",
@@ -2013,7 +2067,7 @@ data: ${JSON.stringify({ ids })}
     const isEvents = method === "GET" && path === "/api/events";
     const detailId = /^\/api\/requests\/([1-9]\d{0,15})(\/replay)?$/.exec(path);
     const known = method === "GET" && (path === "/api/session" || path === "/api/requests" || path === "/api/har" || detailId && !detailId[2]) || isEvents || method === "POST" && detailId && detailId[2];
-    if (!known) return text(res, 404, "Not found.");
+    if (!known) return text2(res, 404, "Not found.");
     if (!constantTimeEqual(headerToken, token) && !(isEvents && constantTimeEqual(queryToken, token))) return json(res, 403, { error: NO_TOKEN });
     if (isEvents) {
       res.writeHead(200, { "Content-Type": "text/event-stream; charset=utf-8", Connection: "keep-alive" });
@@ -2048,7 +2102,7 @@ data: ${JSON.stringify({ ids })}
     try {
       handle(req, res);
     } catch {
-      if (!res.headersSent) text(res, 500, "Internal error.");
+      if (!res.headersSent) text2(res, 500, "Internal error.");
       else res.end();
     }
   });
@@ -2265,6 +2319,62 @@ function cors401(origin) {
 import { Agent, createServer as createServer2, request } from "http";
 import { connect as connect2 } from "net";
 
+// src/session/delivery.ts
+function text(h, name) {
+  if (!Object.hasOwn(h, name)) return void 0;
+  const v = h[name];
+  return Array.isArray(v) ? v.join(", ") : v;
+}
+function dropUntrustedForwarded(out, changes) {
+  for (const name of UNTRUSTED_VISITOR_HEADERS) {
+    const from = text(out, name);
+    if (from === void 0) continue;
+    delete out[name];
+    changes.push({ kind: "remove", name, from, source: "visitor" });
+  }
+}
+function swapHost(out, host, changes) {
+  changes.push({ kind: "replace", name: "host", from: out.host ?? "", to: host, source: "host" });
+  out.host = host;
+  const forwarded = text(out, "x-forwarded-host");
+  if (forwarded === void 0) return;
+  delete out["x-forwarded-host"];
+  changes.push({ kind: "remove", name: "x-forwarded-host", from: forwarded, source: "host" });
+}
+function applyHeaders(out, headers, changes) {
+  for (const [name, to] of Object.entries(headers)) {
+    const from = text(out, name);
+    if (to === "") {
+      if (from === void 0) continue;
+      delete out[name];
+      changes.push({ kind: "remove", name, from, source: "headers" });
+    } else {
+      out[name] = to;
+      changes.push(from === void 0 ? { kind: "add", name, to, source: "headers" } : { kind: "replace", name, from, to, source: "headers" });
+    }
+  }
+}
+function stripDutoCredentials(out, stripped, changes) {
+  for (const name of ["x-duto-auth", "authorization"]) {
+    const from = text(out, name);
+    if (from !== void 0 && text(stripped, name) === void 0) changes.push({ kind: "remove", name, from, source: "duto" });
+  }
+  if (text(out, "cookie") !== text(stripped, "cookie")) changes.push({ kind: "remove", name: "cookie", from: TUNNEL_COOKIE, source: "duto" });
+}
+function deliver(h, route) {
+  const changes = [];
+  let out = { ...h };
+  if (!route.trustForwarded) dropUntrustedForwarded(out, changes);
+  if (route.host) swapHost(out, route.host, changes);
+  if (route.headers) applyHeaders(out, route.headers, changes);
+  if (route.auth) {
+    const stripped = route.auth.strip(out);
+    stripDutoCredentials(out, stripped, changes);
+    out = stripped;
+  }
+  return changes.length ? { headers: out, changes } : { headers: h, changes };
+}
+
 // src/session/errorPage.ts
 var esc = (s) => s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 function wantsHtml(accept) {
@@ -2373,6 +2483,7 @@ var PREFLIGHT_NO_REPLAY = "CORS preflight cannot be replayed.";
 var TEXT2 = /^(text\/|application\/(json|xml|javascript|x-www-form-urlencoded|graphql)|[^;]*\+(json|xml))/i;
 var MAX_BODY = 64 * 1024;
 var LOCAL_AGENT = new Agent({ keepAlive: false });
+var errorText = (err) => err instanceof Error ? err.message || err.code || err.name : String(err);
 function flat(h) {
   const out = {};
   for (const [k, v] of Object.entries(h)) if (v !== void 0) out[k] = Array.isArray(v) ? v.join(", ") : v;
@@ -2431,19 +2542,6 @@ async function localHost(port) {
   hostCache.set(port, { host, at: Date.now() });
   return host;
 }
-function rewrite(h, route) {
-  if (!route.host && !route.headers) return h;
-  const out = { ...h };
-  if (route.host) {
-    out.host = route.host;
-    delete out["x-forwarded-host"];
-  }
-  for (const [k, v] of Object.entries(route.headers ?? {})) {
-    if (v === "") delete out[k];
-    else out[k] = v;
-  }
-  return out;
-}
 var escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function rewriteLocation(location, localHost2, publicHost) {
   const host = escapeRe(localHost2.replace(/:\d+$/, ""));
@@ -2532,10 +2630,6 @@ function deny(req, res, html) {
   res.end(body);
   return { status, out, body };
 }
-function delivered(h, route) {
-  const out = rewrite(h, route);
-  return route.auth ? route.auth.strip(out) : out;
-}
 async function isUp(port) {
   return await probe("127.0.0.1", port) || await probe("::1", port);
 }
@@ -2577,7 +2671,7 @@ async function startProxy(o) {
       await new Promise((r) => setTimeout(r, 50));
     }
   }
-  function record(req, route, headers, websocket, access, noReplay) {
+  function record(req, route, headers, changes, websocket, access, noReplay) {
     const id = nextId++;
     const started = Date.now();
     o.store.add({
@@ -2601,7 +2695,8 @@ async function startProxy(o) {
       truncated: false,
       resTruncated: false,
       ...access && { access },
-      ...noReplay && { noReplay }
+      ...noReplay && { noReplay },
+      ...changes.length && { headerChanges: changes }
     });
     return { id, started };
   }
@@ -2659,11 +2754,18 @@ async function startProxy(o) {
       reqComplete: true,
       truncated: false,
       resTruncated: false,
-      replayOf: r.id
+      replayOf: r.id,
+      ...r.headerChanges && { headerChanges: r.headerChanges }
     });
     void (async () => {
       const host = await localHost(route.port);
-      const upstream = request({ host, port: route.port, agent: LOCAL_AGENT, method: r.method, path: r.path, headers }, (up) => trackResponse(newId, started, up));
+      let upstream;
+      try {
+        upstream = request({ host, port: route.port, agent: LOCAL_AGENT, method: r.method, path: r.path, headers }, (up) => trackResponse(newId, started, up));
+      } catch (err) {
+        o.store.update(newId, { status: 502, durationMs: Date.now() - started, error: errorText(err) });
+        return;
+      }
       upstream.on("error", (err) => o.store.update(newId, { status: 503, durationMs: Date.now() - started, error: err.message || err.code || err.name }));
       upstream.end(r.reqRaw ?? void 0);
     })();
@@ -2689,42 +2791,55 @@ async function startProxy(o) {
     }
     const preflight = !!route.auth && isPreflight(req.method, req.headers);
     const access = route.auth && !preflight ? route.auth.access(req.headers) : void 0;
-    const headers = delivered(req.headers, route);
+    const { headers, changes } = deliver(req.headers, route);
     if (access?.kind === "denied") {
       const html = wantsHtml(req.headers.accept);
-      const { id: id2, started: started2 } = record(req, route, headers, false, html ? void 0 : access, DENIED_NO_REPLAY);
+      const { id: id2, started: started2 } = record(req, route, headers, changes, false, html ? void 0 : access, DENIED_NO_REPLAY);
       const { status, out, body } = deny(req, res, html);
       o.store.update(id2, { status, durationMs: Date.now() - started2, bytes: Buffer.byteLength(body), resHeaders: out });
       return;
     }
-    const { id, started } = record(req, route, headers, false, access, preflight ? PREFLIGHT_NO_REPLAY : void 0);
+    const { id, started } = record(req, route, headers, changes, false, access, preflight ? PREFLIGHT_NO_REPLAY : void 0);
     const reqCap = new Capture(TEXT2.test(req.headers["content-type"] ?? ""), max);
+    const recordArrival = () => o.store.update(id, { reqComplete: true, reqRaw: reqCap.truncated ? null : reqCap.raw(), reqBodyBytes: reqCap.total, reqTruncated: reqCap.truncated, reqBody: reqCap.text() });
     req.pause();
     const host = await localHost(route.port);
-    const upstream = request(
-      { host, port: route.port, agent: LOCAL_AGENT, method: req.method, path: req.url, headers },
-      (up) => {
-        if (preflight) {
-          const out = preflightHeaders(up.headers);
-          res.writeHead(up.statusCode ?? 502, out);
-          res.end();
-          up.on("end", () => o.store.update(id, { status: up.statusCode ?? null, durationMs: Date.now() - started, bytes: 0, resHeaders: flat(out) }));
-          up.resume();
-          return;
-        }
-        if (route.host && route.rewriteRedirects !== false && typeof up.headers.location === "string") {
-          const from = up.headers.location;
-          const to = rewriteLocation(from, route.host, hostOf(req));
-          if (to !== from) {
-            up.headers.location = to;
-            o.store.update(id, { redirect: { from, to } });
+    let upstream;
+    try {
+      upstream = request(
+        { host, port: route.port, agent: LOCAL_AGENT, method: req.method, path: req.url, headers },
+        (up) => {
+          if (preflight) {
+            const out = preflightHeaders(up.headers);
+            res.writeHead(up.statusCode ?? 502, out);
+            res.end();
+            up.on("end", () => o.store.update(id, { status: up.statusCode ?? null, durationMs: Date.now() - started, bytes: 0, resHeaders: flat(out) }));
+            up.resume();
+            return;
+          }
+          if (route.host && route.rewriteRedirects !== false && typeof up.headers.location === "string") {
+            const from = up.headers.location;
+            const to = rewriteLocation(from, route.host, hostOf(req));
+            if (to !== from) {
+              up.headers.location = to;
+              o.store.update(id, { redirect: { from, to } });
+            }
           }
+          res.writeHead(up.statusCode ?? 502, up.statusMessage, up.headers);
+          trackResponse(id, started, up, reqCap);
+          up.pipe(res);
         }
-        res.writeHead(up.statusCode ?? 502, up.statusMessage, up.headers);
-        trackResponse(id, started, up, reqCap);
-        up.pipe(res);
-      }
-    );
+      );
+    } catch (err) {
+      req.on("data", (c) => reqCap.push(c));
+      req.on("end", recordArrival);
+      req.resume();
+      const msg = `Duto could not forward this request: ${errorText(err)}`;
+      res.writeHead(502, { "content-type": "text/plain; charset=utf-8", "cache-control": "no-store" });
+      res.end(req.method === "HEAD" ? void 0 : msg);
+      o.store.update(id, { status: 502, durationMs: Date.now() - started, bytes: Buffer.byteLength(msg), error: errorText(err) });
+      return;
+    }
     res.on("close", () => {
       if (!res.writableFinished) upstream.destroy();
     });
@@ -2739,7 +2854,7 @@ async function startProxy(o) {
       } else res.destroy();
       o.store.update(id, { status: 503, durationMs: Date.now() - started, bytes: res.headersSent ? 0 : Buffer.byteLength(msg), error: err.message || err.code || err.name, reqBody: reqCap.text() });
     });
-    req.on("end", () => o.store.update(id, { reqComplete: true, reqRaw: reqCap.truncated ? null : reqCap.raw(), reqBodyBytes: reqCap.total, reqTruncated: reqCap.truncated, reqBody: reqCap.text() }));
+    req.on("end", recordArrival);
     if (preflight) {
       req.resume();
       upstream.end();
@@ -2753,8 +2868,8 @@ async function startProxy(o) {
     const route = await routeFor(req);
     if (!route) return void client.end("HTTP/1.1 404 Not Found\r\nConnection: close\r\n\r\n");
     const access = route.auth?.access(req.headers);
-    const headers = delivered(req.headers, route);
-    const { id, started } = record(req, route, headers, true, access, access?.kind === "denied" ? DENIED_NO_REPLAY : void 0);
+    const { headers, changes } = deliver(req.headers, route);
+    const { id, started } = record(req, route, headers, changes, true, access, access?.kind === "denied" ? DENIED_NO_REPLAY : void 0);
     if (access?.kind === "denied") {
       client.end(WS_DENIED);
       o.store.update(id, { status: 401, durationMs: Date.now() - started });
@@ -3012,7 +3127,7 @@ var Session = class {
   }
   blank(spec, adHoc) {
     this.specs.set(keyOf(spec), spec);
-    return { key: keyOf(spec), name: spec.name, port: spec.port, ...spec.host ? { host: spec.host } : {}, ...spec.headers ? { headers: spec.headers } : {}, ...spec.rewriteRedirects === false ? { rewriteRedirects: false } : {}, ...spec.auth?.length ? { auth: true } : {}, url: null, hostname: null, endpointId: null, status: "opening", error: null, adHoc, requests: 0, errors: 0 };
+    return { key: keyOf(spec), name: spec.name, port: spec.port, ...spec.host ? { host: spec.host } : {}, ...spec.headers ? { headers: spec.headers } : {}, ...spec.rewriteRedirects === false ? { rewriteRedirects: false } : {}, ...spec.trustForwarded ? { trustForwarded: true } : {}, ...spec.auth?.length ? { auth: true } : {}, url: null, hostname: null, endpointId: null, status: "opening", error: null, adHoc, requests: 0, errors: 0 };
   }
   async open(t, existing, retrying = false) {
     if (this.stopped) return;
@@ -3041,7 +3156,7 @@ var Session = class {
       t.hostname = res.hostname;
       t.endpointId = res.endpointId;
       t.error = null;
-      this.routes.set(res.hostname.toLowerCase(), { tunnel: t.key, port: t.port, host: t.host, headers: t.headers, rewriteRedirects: t.rewriteRedirects, auth });
+      this.routes.set(res.hostname.toLowerCase(), { tunnel: t.key, port: t.port, host: t.host, headers: t.headers, rewriteRedirects: t.rewriteRedirects, trustForwarded: t.trustForwarded, auth });
       t.status = await isPortListening(t.port) ? "live" : "no-listener";
       this.ensureCloudflared(res.tunnelToken);
       this.emit();
@@ -3261,15 +3376,17 @@ async function runSession(specs, source, flags) {
       inspectorError = err instanceof Error ? err.message : String(err);
     }
   }
+  const warnings = credentialWarnings(specs);
   if (wantsUi(flags)) {
-    const { runFullscreen } = await import("./fullscreen-MZMQ6ADN.js");
-    const code = await runFullscreen(session, specs, CLI_VERSION, inspector, inspectorError, update);
+    const { runFullscreen } = await import("./fullscreen-MSVJF43W.js");
+    const code = await runFullscreen(session, specs, CLI_VERSION, inspector, inspectorError, update, warnings);
     await inspector?.close().catch(() => void 0);
     process.exit(code);
   }
   console.log(`${mark()} ${paint("muted", `${CLI_VERSION} \xB7 ${source} \xB7 Ctrl+C to stop`)}`);
   if (inspector) console.log(paint("muted", `inspector: ${inspector.openUrl}`));
   if (inspectorError) console.log(warn(`inspector failed to start: ${inspectorError}`));
+  for (const w of warnings) console.log(warn(w));
   void update.then((latest) => latest && console.log(warn(updateLine(latest))));
   const stopLog = runPlain(session, (l) => console.log(l));
   const stopped = new Promise((resolve) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dutodev/cli",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Expose a local port at https://<name>-<user>.duto.dev with one command.",
   "license": "MIT",
   "type": "module",