@mycadet/gateway 0.12.9 → 0.12.11

package/src/http/routes/ingress-domains.ts

@@ -1,5 +1,5 @@
 /**
- * Loopback-guarded recording of a tunnel's public URL.
+ * Guardian-authed recording of a tunnel's public URL.
  *
  *   POST /v1/ingress/domains — the CLI (its ngrok agent, today) tells the
  *   gateway the public URL its tunnel published; the gateway writes
@@ -19,11 +19,7 @@ import { normalizeHttpPublicBaseUrlWithoutTrailingSlash } from "@mycadet/service
 
 import type { ConfigFileCache } from "../../config-file-cache.js";
 import { writeManagedPublicBaseUrl } from "../../tunnel/client.js";
-import {
-  enforceLoopbackOnly,
-  errorResponse,
-  rejectBrowserOrigin,
-} from "../loopback-guard.js";
+import { errorResponse, rejectBrowserOrigin } from "../loopback-guard.js";
 
 const SaveIngressDomainRequestSchema = z.object({
   publicBaseUrl: z.string(),
@@ -41,8 +37,6 @@ export async function handleSaveIngressDomain(
     });
   }
 
-  const guardError = enforceLoopbackOnly(req, clientIp, "ingress-domains");
-  if (guardError) return guardError;
   const originError = rejectBrowserOrigin(req, clientIp, "ingress-domains");
   if (originError) return originError;
 

package/src/http/routes/live-voice-websocket.ts

@@ -16,6 +16,7 @@ import {
   requireBoundGuardian,
   requireManagedGuardian,
 } from "./guardian-pin.js";
+import { isWebsocketUpgradeRequest } from "../utils.js";
 
 const log = getLogger("live-voice-ws");
 
@@ -53,7 +54,7 @@ export function createLiveVoiceWebsocketHandler(config: GatewayConfig) {
     req: Request,
     server: import("bun").Server<unknown>,
   ): Promise<Response | undefined> {
-    if (req.headers.get("upgrade")?.toLowerCase() !== "websocket") {
+    if (!isWebsocketUpgradeRequest(req)) {
       return new Response("Upgrade Required", { status: 426 });
     }
 

package/src/http/routes/plugin-webhook-websocket.test.ts

@@ -13,6 +13,7 @@ import {
   isPluginWebhookSocketData,
   type PluginWebhookSocketData,
 } from "./plugin-webhook-websocket.js";
+import { IngressRoute } from "../../channels/plugin-ingress.js";
 
 initSigningKey(Buffer.from("test-signing-key-at-least-32-bytes-long"));
 
@@ -24,7 +25,7 @@ const CONFIG = {
 
 const PLUGIN_SECRET = "plugin-webhook-secret";
 const CADET_SECRET = "platform-webhook-secret";
-const WS_PATH = "/webhooks/plugins/meeting-bot/realtime";
+const WS_PATH = "/webhooks/plugins/example/realtime";
 
 const ROUTE = {
   path: "realtime",
@@ -43,7 +44,7 @@ function credentialsFor(entries: Record<string, string>) {
 }
 
 const CREDENTIALS = credentialsFor({
-  "credential/meeting-bot/webhook_secret": PLUGIN_SECRET,
+  "credential/example/webhook_secret": PLUGIN_SECRET,
   "credential/cadet/webhook_secret": CADET_SECRET,
 });
 
@@ -53,17 +54,9 @@ function resolution(
   return { approved: [], pending: [], problems: [], ...overrides };
 }
 
-function approvedWith(
-  routes: {
-    path: string;
-    kind: "http" | "websocket";
-    signer: "plugin" | "cadet";
-    handshake: "signed-headers" | "signed-query";
-    description: string;
-  }[],
-): PluginIngressResolution {
+function approvedWith(routes: IngressRoute[]): PluginIngressResolution {
   return resolution({
-    approved: [{ plugin: "meeting-bot", routes, digest: "d".repeat(32) }],
+    approved: [{ plugin: "example", routes, digest: "d".repeat(32) }],
   });
 }
 
@@ -128,13 +121,13 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
     expect(res).toBeUndefined();
     expect(upgrades).toHaveLength(1);
-    expect(upgrades[0]!.plugin).toBe("meeting-bot");
+    expect(upgrades[0]!.plugin).toBe("example");
     expect(isPluginWebhookSocketData(upgrades[0])).toBe(true);
   });
 
@@ -145,7 +138,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest({ upgrade: false }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -158,7 +151,7 @@ describe("upgrade gate", () => {
       resolve: () =>
         resolution({
           pending: [
-            { plugin: "meeting-bot", routes: [ROUTE], digest: "d".repeat(32) },
+            { plugin: "example", routes: [ROUTE], digest: "d".repeat(32) },
           ],
         }),
     });
@@ -167,7 +160,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -183,7 +176,7 @@ describe("upgrade gate", () => {
         resolution({
           pending: [
             {
-              plugin: "meeting-bot",
+              plugin: "example",
               routes: [{ ...ROUTE, signer: "cadet" as const }],
               digest: "d".repeat(32),
             },
@@ -195,7 +188,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest({ secret: CADET_SECRET }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -210,7 +203,7 @@ describe("upgrade gate", () => {
         resolution({
           pending: [
             {
-              plugin: "meeting-bot",
+              plugin: "example",
               routes: [{ ...ROUTE, signer: "cadet" as const }],
               digest: "d".repeat(32),
             },
@@ -222,7 +215,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest({ secret: PLUGIN_SECRET }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -240,7 +233,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -255,7 +248,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest({ path: "/webhooks/plugins/meeting-bot/admin" }),
       server,
-      "meeting-bot",
+      "example",
       "admin",
     );
 
@@ -274,7 +267,7 @@ describe("upgrade gate", () => {
     const res = await handle(
       upgradeRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -291,7 +284,7 @@ describe("handshake signature", () => {
     const res = await handle(
       upgradeRequest({ secret: "" }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -306,7 +299,7 @@ describe("handshake signature", () => {
     const res = await handle(
       upgradeRequest({ secret: "nope" }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -324,7 +317,7 @@ describe("handshake signature", () => {
         timestamp: String(Math.floor(Date.now() / 1000) - 3600),
       }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -339,7 +332,7 @@ describe("handshake signature", () => {
     const res = await handle(
       upgradeRequest({ timestamp: "" }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -355,7 +348,7 @@ describe("handshake signature", () => {
     const res = await handle(
       upgradeRequest({ signPath: "/webhooks/plugins/meeting-bot/other" }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -370,7 +363,7 @@ describe("handshake signature", () => {
     const res = await handle(
       upgradeRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -388,7 +381,7 @@ describe("handshake signature", () => {
       await handle(
         upgradeRequest({ secret: CADET_SECRET }),
         server,
-        "meeting-bot",
+        "example",
         "realtime",
       ),
     ).toBeUndefined();
@@ -397,7 +390,7 @@ describe("handshake signature", () => {
     const rejected = await handle(
       upgradeRequest({ secret: PLUGIN_SECRET }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
     expect(rejected?.status).toBe(403);
@@ -433,7 +426,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       signedQueryRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -454,7 +447,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       new Request(url.toString(), { headers: { upgrade: "websocket" } }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -469,7 +462,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       signedQueryRequest({ secret: "not-the-plugin-secret" }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -487,7 +480,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       signedQueryRequest(),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -503,7 +496,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       upgradeRequest({ secret: PLUGIN_SECRET }),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -523,7 +516,7 @@ describe("signed-query handshake", () => {
     const res = await handle(
       new Request(url.toString()),
       server,
-      "meeting-bot",
+      "example",
       "realtime",
     );
 
@@ -551,7 +544,7 @@ function socketData(
   return {
     wsType: "plugin-webhook",
     config: CONFIG,
-    plugin: "meeting-bot",
+    plugin: "example",
     path: "realtime",
     queue: [],
     queuedBytes: 0,
@@ -591,7 +584,7 @@ describe("frame delivery", () => {
     expect(calls).toHaveLength(1);
     expect(calls[0]!.method).toBe("user_route_post");
     expect(calls[0]!.params).toMatchObject({
-      pathParams: { path: "plugins/meeting-bot/realtime" },
+      pathParams: { path: "plugins/example/realtime" },
     });
     // The frame travels as the raw body, byte-for-byte.
     expect(new TextDecoder().decode(calls[0]!.binary)).toBe(evt("joined"));

package/src/http/routes/plugin-webhook-websocket.ts

@@ -41,6 +41,7 @@ import {
   timestampWithinTolerance,
   verifyCadetSignature,
 } from "../cadet-signature.js";
+import { isWebsocketUpgradeRequest } from "../utils.js";
 
 const log = getLogger("plugin-webhook-ws");
 
@@ -131,7 +132,7 @@ export function createPluginWebhookWebsocketHandler(deps: PluginWebhookWsDeps) {
     plugin: string,
     path: string,
   ): Promise<Response | undefined> {
-    if (req.headers.get("upgrade")?.toLowerCase() !== "websocket") {
+    if (!isWebsocketUpgradeRequest(req)) {
       return new Response("Upgrade Required", { status: 426 });
     }
 

package/src/http/routes/remote-web-pairing-challenge.ts

@@ -21,7 +21,14 @@ import { methodNotAllowed, readJsonStringField } from "../route-helpers.js";
 
 const MAX_CHALLENGE_BODY_BYTES = 512;
 
-function parsePublicBaseUrl(value: string): string | null {
+/**
+ * Normalize an advertised base URL to `origin + trailing-slash-stripped path`,
+ * or null when the value is empty, unparseable, non-http(s), or hostless.
+ * Shared with the direct pairing mint (remote-web/pairing-mint.ts), which
+ * validates the CLI-passed URL with the exact same rules the HTTP route
+ * applies.
+ */
+export function parsePublicBaseUrl(value: string): string | null {
   if (!value.trim()) {
     return null;
   }

package/src/http/routes/runtime-audio-stream.ts

@@ -35,6 +35,7 @@ import {
 import { admitActorToken } from "../../auth/actor-token-revocation.js";
 import { parseSub } from "../../auth/subject.js";
 import type { GatewayConfig } from "../../config.js";
+import { isWebsocketUpgradeRequest } from "../utils.js";
 
 /**
  * Cap on frames held while the upstream socket is still connecting, so a
@@ -83,7 +84,7 @@ export function authorizeRuntimeAudioStream(
   config: GatewayConfig,
   log: Logger,
 ): RuntimeAudioStreamAuth {
-  if (req.headers.get("upgrade")?.toLowerCase() !== "websocket") {
+  if (!isWebsocketUpgradeRequest(req)) {
     return {
       ok: false,
       response: new Response("Upgrade Required", { status: 426 }),

package/src/http/routes/speech-relay-websocket.ts

@@ -22,7 +22,7 @@
 
 import type { OutgoingHttpHeaders } from "node:http";
 
-import { tunnelHostForPlatformHost } from "@mycadet/service-contracts/ingress";
+import { tunnelHostForCloudHost } from "@mycadet/service-contracts/ingress";
 
 import { resolveScopeProfile } from "../../auth/scopes.js";
 import { validateEdgeToken } from "../../auth/token-exchange.js";
@@ -33,6 +33,7 @@ import { getLogger } from "../../logger.js";
 import { getCloudBaseUrl } from "../../cloud-url.js";
 import { TUNNEL_FORWARDED_HEADER } from "../../tunnel/bridge-utils.js";
 import { requestHasTunnelBridgeAuth } from "../../tunnel/bridge-auth.js";
+import { isWebsocketUpgradeRequest } from "../utils.js";
 
 const log = getLogger("speech-relay-ws");
 
@@ -162,7 +163,7 @@ function jsonError(status: number, code: string, detail: string): Response {
  * shared with the web live-voice client; this wrapper adds the scheme.
  */
 export function tunnelOriginForPlatformHost(host: string): string | null {
-  const tunnelHost = tunnelHostForPlatformHost(host);
+  const tunnelHost = tunnelHostForCloudHost(host);
   return tunnelHost ? `https://${tunnelHost}` : null;
 }
 
@@ -325,7 +326,7 @@ export function createSpeechRelayUpgradeHandler(
 
     // Non-upgrade request: this is the daemon's dial-failure probe.
     // Replay the gate and hand back tunnel's own rejection.
-    if (req.headers.get("upgrade")?.toLowerCase() !== "websocket") {
+    if (!isWebsocketUpgradeRequest(req)) {
       const apiKey = await readAssistantApiKey(deps);
       if (!apiKey) {
         return jsonError(

package/src/http/utils.ts

@@ -0,0 +1,3 @@
+export function isWebsocketUpgradeRequest(req: Request) {
+  return req.headers.get("upgrade")?.toLowerCase() === "websocket";
+}

package/src/index.ts

@@ -278,6 +278,7 @@ import {
   enablePublicIngress,
 } from "./tunnel/client.js";
 import { VERSION_HEADER_NAME, VERSION_HEADER_VALUE } from "./version.js";
+import { isWebsocketUpgradeRequest } from "./http/utils.js";
 
 const log = getLogger("main");
 
@@ -889,11 +890,11 @@ async function main() {
       handler: () => psHandler.handlePs(),
     },
 
-    // ── Ingress domain recording (localhost CLI only, bearer-authed) ──
+    // ── Ingress domain recording (guardian bearer, loopback fallback) ──
     {
       path: "/v1/ingress/domains",
       method: "POST",
-      auth: "edge",
+      auth: "edge-guardian",
       handler: (req, _params, getClientIp) =>
         handleSaveIngressDomain(req, getClientIp(), configFileCache),
     },
@@ -2309,7 +2310,7 @@ async function main() {
     // Plugin ingress declared as `websocket`. Claimed only for a genuine
     // upgrade — a plain request to the same path stays with the route table,
     // where the HTTP half 404s it for not being an approved HTTP route.
-    if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
+    if (isWebsocketUpgradeRequest(req)) {
       const match = url.pathname.match(PLUGIN_WEBHOOK_PATH_PATTERN);
       if (match) {
         const upgradeResult = await handlePluginWebhookWs(

package/src/remote-web/pairing-challenge-rate-limit-store.ts

@@ -1,5 +1,28 @@
+/**
+ * Creation-rate limit for remote-web pairing challenges — 20 per minute,
+ * FILE-BACKED under GATEWAY_SECURITY_DIR so every minting process counts
+ * against the same window: the `gateway pairing mint` CLI runs in its own
+ * process (never over the gateway's IPC socket — the assistant daemon shares
+ * that socket), and the gateway's HTTP mint route runs in the server
+ * process. A per-process window would be meaningless for the CLI (a fresh
+ * process per mint), so the timestamps persist to disk and every call
+ * re-reads them.
+ */
+
+import {
+  mkdirSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { dirname, join } from "node:path";
+
+import { getGatewaySecurityDir } from "../paths.js";
+
 const RATE_LIMIT_MAX_CHALLENGES = 20;
 const RATE_LIMIT_WINDOW_MS = 60_000;
+const STORE_FILENAME = "remote-web-pairing-creation-rate.json";
 
 export interface RemoteWebPairingChallengeRateLimit {
   retryAfterSeconds: number;
@@ -7,7 +30,69 @@ export interface RemoteWebPairingChallengeRateLimit {
 
 const challengeCreationTimestamps: number[] = [];
 
+let lastResolvedStorePath: string | null = null;
+
+function rateLimitStoreFilePath(): string {
+  const resolved = join(getGatewaySecurityDir(), STORE_FILENAME);
+  lastResolvedStorePath = resolved;
+  return resolved;
+}
+
+function isNotExistError(err: unknown): boolean {
+  return err instanceof Error && "code" in err && err.code === "ENOENT";
+}
+
+/** Re-sync the timestamps from disk; a missing file is an empty window. */
+function loadFromDisk(): void {
+  challengeCreationTimestamps.length = 0;
+
+  let raw: string;
+  try {
+    raw = readFileSync(rateLimitStoreFilePath(), "utf-8");
+  } catch (err) {
+    if (isNotExistError(err)) return;
+    throw err;
+  }
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    console.warn(
+      `[pairing-challenge-rate-limit] could not read ${rateLimitStoreFilePath()} — starting empty.`,
+    );
+    return;
+  }
+  if (
+    typeof parsed !== "object" ||
+    parsed === null ||
+    !("timestamps" in parsed) ||
+    !Array.isArray(parsed.timestamps)
+  ) {
+    return;
+  }
+  for (const timestamp of parsed.timestamps) {
+    if (typeof timestamp === "number") {
+      challengeCreationTimestamps.push(timestamp);
+    }
+  }
+}
+
+/** Persist the current window atomically so other processes see it. */
+function saveToDisk(): void {
+  const filePath = rateLimitStoreFilePath();
+  mkdirSync(dirname(filePath), { recursive: true });
+  const tmpPath = `${filePath}.${process.pid}.tmp`;
+  writeFileSync(
+    tmpPath,
+    JSON.stringify({ timestamps: [...challengeCreationTimestamps] }),
+    { mode: 0o600 },
+  );
+  renameSync(tmpPath, filePath);
+}
+
 export function recordRemoteWebPairingChallengeCreation(): RemoteWebPairingChallengeRateLimit | null {
+  loadFromDisk();
   const now = Date.now();
   const windowStart = now - RATE_LIMIT_WINDOW_MS;
 
@@ -26,9 +111,18 @@ export function recordRemoteWebPairingChallengeCreation(): RemoteWebPairingChall
   }
 
   challengeCreationTimestamps.push(now);
+  saveToDisk();
   return null;
 }
 
 export function resetRemoteWebPairingChallengeRateLimiterForTests(): void {
   challengeCreationTimestamps.length = 0;
+  // Best effort on the LAST-RESOLVED path — see the challenge store's note.
+  if (lastResolvedStorePath) {
+    try {
+      rmSync(lastResolvedStorePath, { force: true });
+    } catch {
+      /* the timestamps are cleared either way */
+    }
+  }
 }