@threadbase-sh/streamer 1.29.1 → 1.29.2

package/dist/index.d.cts

@@ -321,6 +321,7 @@ interface ServerConfig {
     codexRoots?: string[];
     scannerPersistent?: boolean;
     ptyGracePeriodMs?: number;
+    wsAuthTimeoutMs?: number;
     cacheDir?: string;
     tailSize?: number;
     directoryScanDebounceMs?: number;
@@ -859,7 +860,7 @@ type ApiDeps = {
     handlePairExchange: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     handleBrowse: (url: URL, res: ServerResponse) => Promise<void>;
     handleMkdir: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-    handleWsOpen: (ws: WebSocket) => void;
+    handleWsOpen: (ws: WebSocket, preAuthed: boolean) => void;
     handleWsMessage: (ws: WebSocket, raw: unknown) => void;
     handleWsClose: (ws: WebSocket) => void;
     agentClient: AgentClient | null;
@@ -1015,6 +1016,9 @@ declare class StreamerServer {
     private sessionSubscribers;
     private clientIdToWs;
     private wsToClientId;
+    private wsAuthed;
+    private wsAuthPending;
+    private wsAuthTimeoutMs;
     private cache;
     private projectsRepo;
     private conversationsRepo;
@@ -1043,6 +1047,7 @@ declare class StreamerServer {
      * a full broadcast if no match exists (old clients, or no WS registered yet).
      */
     private broadcastOrUnicastSessionList;
+    private completeWsAuth;
     private addSessionSubscriber;
     private startGraceTimer;
     get port(): number;

package/dist/index.d.ts

@@ -321,6 +321,7 @@ interface ServerConfig {
     codexRoots?: string[];
     scannerPersistent?: boolean;
     ptyGracePeriodMs?: number;
+    wsAuthTimeoutMs?: number;
     cacheDir?: string;
     tailSize?: number;
     directoryScanDebounceMs?: number;
@@ -859,7 +860,7 @@ type ApiDeps = {
     handlePairExchange: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     handleBrowse: (url: URL, res: ServerResponse) => Promise<void>;
     handleMkdir: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-    handleWsOpen: (ws: WebSocket) => void;
+    handleWsOpen: (ws: WebSocket, preAuthed: boolean) => void;
     handleWsMessage: (ws: WebSocket, raw: unknown) => void;
     handleWsClose: (ws: WebSocket) => void;
     agentClient: AgentClient | null;
@@ -1015,6 +1016,9 @@ declare class StreamerServer {
     private sessionSubscribers;
     private clientIdToWs;
     private wsToClientId;
+    private wsAuthed;
+    private wsAuthPending;
+    private wsAuthTimeoutMs;
     private cache;
     private projectsRepo;
     private conversationsRepo;
@@ -1043,6 +1047,7 @@ declare class StreamerServer {
      * a full broadcast if no match exists (old clients, or no WS registered yet).
      */
     private broadcastOrUnicastSessionList;
+    private completeWsAuth;
     private addSessionSubscriber;
     private startGraceTimer;
     get port(): number;

package/dist/index.js

@@ -164,7 +164,7 @@ function verifySignature(rawBody, signature, secret) {
   }
 }
 function isWithinSkew(timestampHeader, skewSeconds) {
-  if (!timestampHeader) return true;
+  if (!timestampHeader) return false;
   const t = Number(timestampHeader);
   if (!Number.isFinite(t)) return false;
   const now = Math.floor(Date.now() / 1e3);
@@ -2551,7 +2551,7 @@ function isLocalRequest(remoteAddr) {
   const addr = remoteAddr ?? "";
   return addr === "127.0.0.1" || addr === "::1" || addr === "::ffff:127.0.0.1";
 }
-var PUBLIC_PATHS = /* @__PURE__ */ new Set(["/healthz"]);
+var PUBLIC_PATHS = /* @__PURE__ */ new Set(["/healthz", "/ws"]);
 var PUBLIC_POST_PATHS = /* @__PURE__ */ new Set(["/api/pair/exchange", "/api/__update"]);
 var PUBLIC_POST_PREFIXES = ["/internal/sessions/"];
 var authMiddleware = (deps) => async (c, next) => {
@@ -3014,14 +3014,16 @@ var createWsRoutes = (deps, upgradeWebSocket) => {
   const app = new Hono10();
   app.get(
     "/ws",
-    upgradeWebSocket(() => {
+    upgradeWebSocket((c) => {
+      const key = c.req.query("key");
+      const preAuthed = typeof key === "string" && validateApiKey(key, deps.apiKey);
       let openWs = null;
       return {
         onOpen(_evt, ws) {
           const raw = ws.raw;
           if (!raw) return;
           openWs = raw;
-          deps.handleWsOpen(raw);
+          deps.handleWsOpen(raw, preAuthed);
         },
         onMessage(evt, _ws) {
           if (openWs) deps.handleWsMessage(openWs, evt.data);
@@ -4928,6 +4930,13 @@ function deriveProjectChatTitle(input) {
   return `Untitled \xB7 ${input.id.slice(0, 8)}`;
 }
 
+// src/services/questions/permissionAnswerKeys.ts
+var ANSWER_KEYS_ALLOWLIST = /^(?:\r|[yn]\r|\x03|\d+\r)$/;
+function sanitizeAnswerKeys(keys) {
+  if (keys === void 0) return void 0;
+  return ANSWER_KEYS_ALLOWLIST.test(keys) ? keys : void 0;
+}
+
 // src/services/questions/detectAskUserQuestion.ts
 function normalizeContent2(raw) {
   if (Array.isArray(raw)) return raw;
@@ -5532,6 +5541,8 @@ var WSHub = class {
 var BROWSE_SYSTEM_PROMPT = (browseRoot) => `You are working within the project boundary: ${browseRoot}. Do not read, write, or execute commands that access files or directories outside this boundary.`;
 var DEFAULT_SYSTEM_PROMPT = "When presenting options or choices to the user, limit the options to at most 3.";
 var DEFAULT_PTY_GRACE_PERIOD_MS = 27e4;
+var DEFAULT_WS_AUTH_TIMEOUT_MS = 5e3;
+var WS_CLOSE_UNAUTHORIZED = 4401;
 var REFRESH_TTL_MS = 2e3;
 var START_READY_TIMEOUT_MS = 15e3;
 function parseIncludeAgentsEnv(raw) {
@@ -5622,6 +5633,14 @@ var StreamerServer = class {
   clientIdToWs = /* @__PURE__ */ new Map();
   // Reverse map for cleanup on close
   wsToClientId = /* @__PURE__ */ new Map();
+  // M1 — WS auth. Sockets that have authenticated (via ?key= at upgrade OR a
+  // { type: "auth", token } first message). Only authed sockets are added to
+  // the hub and receive broadcasts.
+  // Plan: https://github.com/RonenMars/threadbase-streamer/blob/a251353bfa417bd48ce3f15086bc336a2c622629/docs/plans/2026-06-24-security-hardening.md#L40
+  wsAuthed = /* @__PURE__ */ new Set();
+  // Keyless sockets awaiting their first-message auth handshake → close timer.
+  wsAuthPending = /* @__PURE__ */ new Map();
+  wsAuthTimeoutMs;
   cache = null;
   projectsRepo = null;
   conversationsRepo = null;
@@ -5661,6 +5680,7 @@ var StreamerServer = class {
     this.scanProfiles = config.scanProfiles;
     this.codexRoots = config.codexRoots ?? [join12(homedir5(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
+    this.wsAuthTimeoutMs = config.wsAuthTimeoutMs ?? DEFAULT_WS_AUTH_TIMEOUT_MS;
     this.defaultSystemPrompt = config.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
     this.defaultPermissionMode = config.defaultPermissionMode ?? loadDefaultPermissionMode() ?? "acceptEdits";
     this.cacheDir = config.cacheDir ?? loadCacheDir() ?? join12(homedir5(), ".threadbase", "cache");
@@ -5918,17 +5938,39 @@ var StreamerServer = class {
       handlePairExchange: (req, res) => this.handlePairExchange(req, res),
       handleBrowse: (url, res) => this.handleBrowse(url, res),
       handleMkdir: (req, res) => this.handleMkdir(req, res),
-      handleWsOpen: (ws) => {
-        this.wsHub.addClient(ws);
-        const sessions = this.sessionStore.list(this.ptyAttachedIds());
-        ws.send(JSON.stringify({ type: "session_list", sessions }));
-        if (this.cacheReady) {
-          ws.send(JSON.stringify({ type: "cache_ready" }));
+      handleWsOpen: (ws, preAuthed) => {
+        if (preAuthed) {
+          this.completeWsAuth(ws);
+          return;
         }
+        const timer = setTimeout(() => {
+          this.wsAuthPending.delete(ws);
+          try {
+            ws.close(WS_CLOSE_UNAUTHORIZED, "auth timeout");
+          } catch {
+          }
+        }, this.wsAuthTimeoutMs);
+        this.wsAuthPending.set(ws, timer);
       },
       handleWsMessage: async (ws, raw) => {
         try {
           const msg = JSON.parse(String(raw));
+          if (!this.wsAuthed.has(ws)) {
+            if (msg.type === "auth" && typeof msg.token === "string") {
+              const t = this.wsAuthPending.get(ws);
+              if (t) clearTimeout(t);
+              this.wsAuthPending.delete(ws);
+              if (validateApiKey(msg.token, this.apiKey)) {
+                this.completeWsAuth(ws);
+              } else {
+                try {
+                  ws.close(WS_CLOSE_UNAUTHORIZED, "unauthorized");
+                } catch {
+                }
+              }
+            }
+            return;
+          }
           if (msg.type === "register" && typeof msg.clientId === "string") {
             const oldClientId = this.wsToClientId.get(ws);
             if (oldClientId) this.clientIdToWs.delete(oldClientId);
@@ -5943,12 +5985,20 @@ var StreamerServer = class {
             }
           }
           if (msg.type === "hold_session" && typeof msg.sessionId === "string") {
-            this.startGraceTimer(msg.sessionId, 0);
+            if (this.sessionSubscribers.get(msg.sessionId)?.has(ws)) {
+              this.startGraceTimer(msg.sessionId, 0);
+            }
           }
         } catch {
         }
       },
       handleWsClose: (ws) => {
+        const pendingTimer = this.wsAuthPending.get(ws);
+        if (pendingTimer) {
+          clearTimeout(pendingTimer);
+          this.wsAuthPending.delete(ws);
+        }
+        this.wsAuthed.delete(ws);
         const clientId = this.wsToClientId.get(ws);
         if (clientId) {
           this.clientIdToWs.delete(clientId);
@@ -6018,6 +6068,20 @@ var StreamerServer = class {
       this.wsHub.broadcast(payload);
     }
   }
+  // M1: finalize a WebSocket auth (via ?key= at upgrade or a first-message
+  // handshake) — register it with the hub and send the initial snapshot. Only
+  // authed sockets reach this, so no unauthenticated client ever receives a
+  // broadcast.
+  // Plan: https://github.com/RonenMars/threadbase-streamer/blob/a251353bfa417bd48ce3f15086bc336a2c622629/docs/plans/2026-06-24-security-hardening.md#L40
+  completeWsAuth(ws) {
+    this.wsAuthed.add(ws);
+    this.wsHub.addClient(ws);
+    const sessions = this.sessionStore.list(this.ptyAttachedIds());
+    ws.send(JSON.stringify({ type: "session_list", sessions }));
+    if (this.cacheReady) {
+      ws.send(JSON.stringify({ type: "cache_ready" }));
+    }
+  }
   addSessionSubscriber(sessionId, ws) {
     let subs = this.sessionSubscribers.get(sessionId);
     if (!subs) {
@@ -6304,6 +6368,9 @@ var StreamerServer = class {
     this.ptyManager.dispose();
     this.fileWatcher.dispose();
     this.wsHub.dispose();
+    for (const timer of this.wsAuthPending.values()) clearTimeout(timer);
+    this.wsAuthPending.clear();
+    this.wsAuthed.clear();
     this.pairTokens.dispose();
     if (this.dbPool) {
       await this.dbPool.end();
@@ -7430,12 +7497,16 @@ var StreamerServer = class {
       return;
     }
     this.pendingPermission.set(sessionId, gate);
+    const safeOptions = gate.options.map((o) => {
+      const answerKeys = sanitizeAnswerKeys(o.answerKeys);
+      return answerKeys === void 0 ? { index: o.index, label: o.label } : { ...o, answerKeys };
+    });
     this.wsHub.broadcast({
       type: "permission",
       sessionId,
       ...gate.prompt ? { prompt: gate.prompt } : {},
       ...gate.detail ? { detail: gate.detail } : {},
-      options: gate.options,
+      options: safeOptions,
       ...gate.cursor !== void 0 ? { cursor: gate.cursor } : {}
     });
   }