@dshn/agent 0.3.2 → 0.3.4

package/lib/index.js

@@ -2272,7 +2272,7 @@ var require_websocket = __commonJS({
     var tls = __require("tls");
     var { randomBytes: randomBytes2, createHash: createHash2 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
-    var { URL } = __require("url");
+    var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
     var Receiver2 = require_receiver();
     var Sender2 = require_sender();
@@ -2773,11 +2773,11 @@ var require_websocket = __commonJS({
         );
       }
       let parsedUrl;
-      if (address instanceof URL) {
+      if (address instanceof URL2) {
         parsedUrl = address;
       } else {
         try {
-          parsedUrl = new URL(address);
+          parsedUrl = new URL2(address);
         } catch {
           throw new SyntaxError(`Invalid URL: ${address}`);
         }
@@ -2914,7 +2914,7 @@ var require_websocket = __commonJS({
           req.abort();
           let addr;
           try {
-            addr = new URL(location, address);
+            addr = new URL2(location, address);
           } catch (e) {
             const err = new SyntaxError(`Invalid URL: ${location}`);
             emitErrorAndClose(websocket, err);
@@ -4728,6 +4728,28 @@ var SHIM_BODY = String.raw`
   }
   window.WebSocket = E2EWebSocket
 
+  // Fail closed for the clients this shim does not seal: an XMLHttpRequest or
+  // sendBeacon to /api would leave the page in plaintext (and the agent now
+  // refuses it with 428 anyway). Refuse here, loudly, so the failure is a
+  // clear error in the console rather than a silent plaintext leak.
+  const refuse = (what, url) => {
+    console.error('[dshn] end-to-end encryption is on: ' + what + ' to ' + url + ' is not sealed and was blocked; use fetch()')
+  }
+  if (typeof XMLHttpRequest !== 'undefined') {
+    const realOpen = XMLHttpRequest.prototype.open
+    XMLHttpRequest.prototype.open = function (method, url) {
+      if (isApi(String(url))) { refuse('XMLHttpRequest', String(url)); throw new DOMException('blocked by end-to-end encryption', 'SecurityError') }
+      return realOpen.apply(this, arguments)
+    }
+  }
+  if (navigator && typeof navigator.sendBeacon === 'function') {
+    const realBeacon = navigator.sendBeacon.bind(navigator)
+    navigator.sendBeacon = function (url, data) {
+      if (isApi(String(url))) { refuse('sendBeacon', String(url)); return false }
+      return realBeacon(url, data)
+    }
+  }
+
   // The host injected this script only because E2E is ON, with the public
   // salt and device id inline — so there is nothing to discover and no
   // window in which dsh's own traffic could slip past the gate: fetch and
@@ -4848,6 +4870,13 @@ function e2eBootstrapTag(info) {
   const json = JSON.stringify({ salt: info.salt, device: info.device }).replace(/</g, "\\u003c");
   return `<script>(function (__dshnInfo) {${SHIM_BODY}})(${json})</script>`;
 }
+function credentialManifestLinks(html) {
+  return html.replace(/<link\b[^>]*>/gi, (tag) => {
+    if (!/\brel\s*=\s*["']?manifest\b/i.test(tag) || /\bcrossorigin\b/i.test(tag))
+      return tag;
+    return tag.replace(/\s*\/?>$/, (end) => ` crossorigin="use-credentials"${end.trim() === "/>" ? " />" : ">"}`);
+  });
+}
 function injectE2EBootstrap(html, info) {
   const tag = e2eBootstrapTag(info);
   const head = /<head(\s[^>]*)?>/i.exec(html);
@@ -4953,6 +4982,9 @@ var ROUTE_FAIL_MAX = 3;
 var ROUTE_FALLBACK_MS = 5 * 6e4;
 var ROUTE_FALLBACK_MAX_MS = 60 * 6e4;
 var ROUTE_PROBE_TIMEOUT_MS = 1e4;
+var MAX_FRAME_BYTES = 128 * 1024 * 1024;
+var SEND_HIGH_WATER = 8 * 1024 * 1024;
+var MAX_BUFFERED = 64 * 1024 * 1024;
 function isValidRouteHost(raw) {
   if (typeof raw !== "string" || raw.length === 0 || raw.length > 253)
     return false;
@@ -5117,8 +5149,10 @@ var AgentTunnel = class {
     this.status.configured = true;
     this.status.subdomain = label;
     this.status.lastError = null;
-    this.control?.close();
+    const old = this.control;
     this.control = null;
+    this.dropStreams();
+    old?.close();
     this.backoffMs = 1e3;
     this.connect();
     return null;
@@ -5141,6 +5175,8 @@ var AgentTunnel = class {
     this.creds = { ...this.creds, e2ePassword: next, e2eSalt: changed ? void 0 : this.creds.e2eSalt };
     this.refreshE2E();
     this.saveCreds(this.creds);
+    if (changed)
+      this.dropStreams();
     return null;
   }
   /**
@@ -5164,7 +5200,12 @@ var AgentTunnel = class {
     const c = this.creds?.relayHost;
     return typeof c === "string" && c !== "" ? c : this.config.relayHost;
   }
-  /** The origin CA to pin, as PEM bytes: inline PEM from the UI, or an env-configured file path. */
+  /**
+   * The origin CA to pin, as PEM bytes: inline PEM from the UI, or an
+   * env-configured file path. A configured file that cannot be read THROWS —
+   * silently falling back to the system CAs would turn a pinned, self-signed
+   * relay into "any certificate the network offers".
+   */
   effectiveOriginCa() {
     const raw = this.creds?.originCa && this.creds.originCa !== "" ? this.creds.originCa : this.config.originCa;
     if (raw === "" || raw === void 0)
@@ -5173,8 +5214,16 @@ var AgentTunnel = class {
       return Buffer.from(raw);
     try {
       return readFileSync(raw);
+    } catch (err) {
+      throw new Error(`cannot read the relay CA file ${raw}: ${err.message}`);
+    }
+  }
+  /** Whether the CA setting is usable (or absent) — the panel's "direct" flag must not throw. */
+  hasOriginCa() {
+    try {
+      return this.effectiveOriginCa() !== null;
     } catch {
-      return null;
+      return true;
     }
   }
   /** The raw self-hosted overrides, for the settings UI to pre-fill (loopback callers only). */
@@ -5184,7 +5233,7 @@ var AgentTunnel = class {
   /** Connection details for the local panel (relay, mode, uptime, latency, throughput). */
   info() {
     const host = this.effectiveRelayHost();
-    const direct = /^wss?:\/\//.test(host) || this.effectiveOriginCa() !== null;
+    const direct = /^wss?:\/\//.test(host) || this.hasOriginCa();
     const live = this.status.connected && this.dialledHost !== null ? this.dialledHost : host;
     return {
       relayHost: live.replace(/^wss?:\/\//, "").replace(/\/.*$/, ""),
@@ -5213,8 +5262,10 @@ var AgentTunnel = class {
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
-    this.control?.close();
+    const old = this.control;
     this.control = null;
+    this.dropStreams();
+    old?.close();
   }
   start() {
     if (!this.config.enabled || this.creds === null)
@@ -5403,8 +5454,30 @@ var AgentTunnel = class {
     const relayHost = this.dialHost();
     const base = relayHost.includes("://") ? relayHost : `wss://${relayHost}`;
     this.dialledHost = relayHost;
-    const wsOpts = { maxPayload: 512 * 1024 * 1024 };
-    const ca = this.effectiveOriginCa();
+    const wsOpts = { maxPayload: MAX_FRAME_BYTES };
+    const dialProblem = (why) => {
+      this.status.lastError = why;
+      this.dialledHost = null;
+      if (this.reconnectTimer !== null)
+        clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = setTimeout(() => this.connect(), this.backoffMs);
+      this.backoffMs = Math.min(this.backoffMs * 2, 3e4);
+    };
+    if (base.startsWith("ws://")) {
+      let hostname2 = "";
+      try {
+        hostname2 = new URL(base).hostname;
+      } catch {
+      }
+      if (!isLoopbackAddress(hostname2) && hostname2 !== "localhost")
+        return dialProblem(`refusing plain ws:// to ${hostname2 || base}: use wss:// (ws:// is allowed to loopback only)`);
+    }
+    let ca;
+    try {
+      ca = this.effectiveOriginCa();
+    } catch (err) {
+      return dialProblem(err.message);
+    }
     if (ca !== null && relayHost === this.effectiveRelayHost())
       wsOpts.ca = ca;
     const ws = new import_websocket.default(`${base}${AGENT_WS_PATH}`, wsOpts);
@@ -5487,9 +5560,18 @@ var AgentTunnel = class {
     if (this.control?.readyState === import_websocket.default.OPEN)
       this.control.send(encodeControl(frame));
   }
-  sendData(kind, id, payload) {
-    if (this.control?.readyState === import_websocket.default.OPEN)
-      this.control.send(encodeData(kind, id, payload));
+  /**
+   * Send a data frame. Returns false when the control socket already holds
+   * more than the high-water mark: the caller should pause its source and
+   * resume it from `flushed`, which fires once this frame has been written.
+   */
+  sendData(kind, id, payload, flushed) {
+    const ws = this.control;
+    if (ws?.readyState !== import_websocket.default.OPEN)
+      return true;
+    const over = ws.bufferedAmount > SEND_HIGH_WATER;
+    ws.send(encodeData(kind, id, payload), over && flushed !== void 0 ? () => flushed() : void 0);
+    return !over;
   }
   onMessage(data, isBinary) {
     try {
@@ -5619,25 +5701,37 @@ var AgentTunnel = class {
     const bare = path.split("?", 1)[0];
     const outHeaders = this.loopbackHeaders(headers);
     if (this.e2eKey !== null && bare.startsWith("/api")) {
-      outHeaders["accept-encoding"] = "identity";
       const marked = headers.some(([k]) => k.toLowerCase() === E2E_HEADER);
+      if (!marked) {
+        this.send({ t: "res_head", id, status: 428, headers: [["content-type", "application/json"], ["cache-control", "no-store"]] });
+        this.sendData(DATA_RES_BODY, id, Buffer.from(JSON.stringify({ error: "end-to-end encryption is on: /api requests must be sealed by the page (reload the page)" })));
+        this.send({ t: "res_end", id });
+        return;
+      }
+      outHeaders["accept-encoding"] = "identity";
+      delete outHeaders["if-none-match"];
+      delete outHeaders["if-modified-since"];
       this.reqE2E.set(id, { method, path, headers: outHeaders, marked, chunks: [] });
       return;
     }
     const wantsDocument = method === "GET" && headers.some(([k, v]) => k.toLowerCase() === "accept" && v.includes("text/html"));
-    const injectBootstrap = this.e2eKey !== null && wantsDocument;
-    if (injectBootstrap)
+    if (wantsDocument) {
       outHeaders["accept-encoding"] = "identity";
+      delete outHeaders["if-none-match"];
+      delete outHeaders["if-modified-since"];
+    }
     const req = http.request({ host: this.config.localHost, port: this.localPort(), method, path, headers: outHeaders }, (res) => {
       const contentType = String(res.headers["content-type"] ?? "");
-      if (injectBootstrap && this.e2eKey !== null && res.statusCode === 200 && /^text\/html\b/i.test(contentType)) {
+      if (wantsDocument && res.statusCode === 200 && /^text\/html\b/i.test(contentType)) {
         const chunks = [];
         res.on("data", (c) => chunks.push(c));
         res.on("end", () => {
-          const html = injectE2EBootstrap(Buffer.concat(chunks).toString("utf8"), { salt: this.e2eSalt, device: this.deviceId });
+          let html = credentialManifestLinks(Buffer.concat(chunks).toString("utf8"));
+          if (this.e2eKey !== null)
+            html = injectE2EBootstrap(html, { salt: this.e2eSalt, device: this.deviceId });
           const body = Buffer.from(html, "utf8");
-          const resHeaders = filterHeaders(headerListFromRaw(res.rawHeaders), /* @__PURE__ */ new Set([...HOP_BY_HOP, "content-length", "content-encoding"]));
-          resHeaders.push(["content-length", String(body.length)]);
+          const resHeaders = filterHeaders(headerListFromRaw(res.rawHeaders), /* @__PURE__ */ new Set([...HOP_BY_HOP, "content-length", "content-encoding", "etag", "last-modified", "cache-control", "expires"]));
+          resHeaders.push(["content-length", String(body.length)], ["cache-control", "no-store"]);
           this.send({ t: "res_head", id, status: 200, headers: resHeaders });
           this.sendData(DATA_RES_BODY, id, body);
           this.send({ t: "res_end", id });
@@ -5651,7 +5745,10 @@ var AgentTunnel = class {
         status: res.statusCode ?? 502,
         headers: filterHeaders(headerListFromRaw(res.rawHeaders))
       });
-      res.on("data", (chunk) => this.sendData(DATA_RES_BODY, id, chunk));
+      res.on("data", (chunk) => {
+        if (!this.sendData(DATA_RES_BODY, id, chunk, () => res.resume()))
+          res.pause();
+      });
       res.on("end", () => this.send({ t: "res_end", id }));
       res.on("error", () => this.send({ t: "abort", id, reason: "response stream error" }));
     });
@@ -5692,8 +5789,8 @@ var AgentTunnel = class {
       res.on("data", (c) => chunks.push(c));
       res.on("end", () => {
         const sealed = seal(this.e2eKey, Buffer.concat(chunks));
-        const resHeaders = filterHeaders(headerListFromRaw(res.rawHeaders), /* @__PURE__ */ new Set([...HOP_BY_HOP, "content-length", "content-encoding"]));
-        resHeaders.push([E2E_HEADER, "1"], ["content-length", String(sealed.length)]);
+        const resHeaders = filterHeaders(headerListFromRaw(res.rawHeaders), /* @__PURE__ */ new Set([...HOP_BY_HOP, "content-length", "content-encoding", "etag", "last-modified", "cache-control", "expires"]));
+        resHeaders.push([E2E_HEADER, "1"], ["content-length", String(sealed.length)], ["cache-control", "no-store"]);
         this.send({ t: "res_head", id, status: res.statusCode ?? 502, headers: resHeaders });
         this.sendData(DATA_RES_BODY, id, sealed);
         this.send({ t: "res_end", id });
@@ -5723,6 +5820,13 @@ var AgentTunnel = class {
     sock.on("open", () => this.send({ t: "ws_ready", id }));
     sock.on("message", (data, isBinary) => {
       const raw = toBuf(data);
+      if (this.control !== null && this.control.bufferedAmount > MAX_BUFFERED) {
+        if (this.sockets.delete(id)) {
+          sock.close(1013, "uplink congested");
+          this.send({ t: "ws_close", id, code: 1013, reason: "uplink congested" });
+        }
+        return;
+      }
       if (sealMessages && this.e2eKey !== null) {
         const typed = Buffer.concat([Buffer.from([isBinary ? E2E_MSG_BINARY : E2E_MSG_TEXT]), raw]);
         this.sendData(DATA_WS_BINARY, id, seal(this.e2eKey, typed));
@@ -5767,9 +5871,17 @@ function targetsManagementRoute(rawPath) {
   const norm = "/" + segs.join("/");
   return norm === "/dshn" || norm.startsWith("/dshn/");
 }
+function isLoopbackAddress(addr) {
+  if (addr === void 0 || addr === "")
+    return false;
+  const a = addr.toLowerCase().replace(/^::ffff:/, "");
+  return a === "::1" || a.startsWith("127.");
+}
 function isLoopbackRequest(req) {
   if (req.headers[TUNNEL_MARKER] !== void 0)
     return false;
+  if (!isLoopbackAddress(req.socket?.remoteAddress))
+    return false;
   const host = String(req.headers.host ?? "");
   const hostname2 = host.replace(/:\d+$/, "").replace(/^\[|\]$/g, "").toLowerCase();
   return hostname2 === "localhost" || hostname2 === "::1" || hostname2.startsWith("127.");
@@ -5935,6 +6047,7 @@ export {
   apply,
   fileStore,
   inject,
+  isLoopbackAddress,
   isLoopbackRequest,
   name,
   settingsStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dshn/agent",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Forward a local dsh web service to the public internet over ds.hn (bundled).",
   "keywords": [
     "dsh",