@threadbase-sh/streamer 1.61.2 → 1.63.0

package/dist/index.cjs

@@ -9150,7 +9150,10 @@ var ConversationHandlers = class {
       score: r.score,
       matches: Array.isArray(r.matches) ? r.matches.map((m) => ({
         field: m.field,
-        snippet: m.snippet
+        snippet: m.snippet,
+        // Offsets into `snippet` for the matched tokens. Absent on metadata
+        // hits, and on scanners older than the one that added them.
+        highlights: m.highlights
       })) : []
     }));
     const page = paginate(applyFilters(adapted, filters), offset, limit);
@@ -11576,6 +11579,55 @@ function parseE2eeRequest(raw) {
   return { version: v, message1 };
 }
 
+// src/e2ee/pair-payload.ts
+var MAX_DEVICE_NAME_CHARS = 100;
+function parseE2eeMsg1Payload(payload) {
+  let raw;
+  try {
+    raw = JSON.parse(payload.toString("utf-8"));
+  } catch {
+    throw new E2eeRequestError("E2EE_MALFORMED", "e2ee message 1 payload is not valid JSON");
+  }
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
+    throw new E2eeRequestError("E2EE_MALFORMED", "e2ee message 1 payload must be an object");
+  }
+  const { v, deviceName, readOnly } = raw;
+  if (typeof v !== "number" || !Number.isInteger(v)) {
+    throw new E2eeRequestError("E2EE_MALFORMED", "e2ee message 1 payload v must be an integer");
+  }
+  if (v !== E2EE_EXCHANGE_VERSION) {
+    throw new E2eeRequestError(
+      "E2EE_VERSION_UNSUPPORTED",
+      `e2ee message 1 payload v ${v} is not supported; this server speaks ${E2EE_EXCHANGE_VERSION}`
+    );
+  }
+  if (typeof readOnly !== "boolean") {
+    throw new E2eeRequestError(
+      "E2EE_MALFORMED",
+      "e2ee message 1 payload readOnly must be a boolean"
+    );
+  }
+  if (deviceName !== void 0 && deviceName !== null && typeof deviceName !== "string") {
+    throw new E2eeRequestError(
+      "E2EE_MALFORMED",
+      "e2ee message 1 payload deviceName must be a string when present"
+    );
+  }
+  return {
+    version: v,
+    deviceName: typeof deviceName === "string" ? deviceName.slice(0, MAX_DEVICE_NAME_CHARS) : null,
+    readOnly
+  };
+}
+function encodeE2eeMsg2Payload(fields) {
+  const payload = {
+    v: E2EE_EXCHANGE_VERSION,
+    ...fields,
+    e2eeRequired: true
+  };
+  return Buffer.from(JSON.stringify(payload), "utf-8");
+}
+
 // src/external-tails.ts
 var import_fs16 = require("fs");
 var EXTERNAL_TAIL_RECENCY_MS = RESUME_BUSY_WINDOW_MS;
@@ -16684,6 +16736,7 @@ var StreamerServer = class {
       return;
     }
     let handshake = null;
+    let registration = null;
     if (e2eeRequest) {
       try {
         handshake = readMessage1({
@@ -16701,6 +16754,13 @@ var StreamerServer = class {
         });
         return;
       }
+      try {
+        registration = parseE2eeMsg1Payload(handshake.payload);
+      } catch (err) {
+        const e = err;
+        json(res, 400, { error: e.message, code: e.code });
+        return;
+      }
     }
     let sealed;
     try {
@@ -16723,8 +16783,9 @@ var StreamerServer = class {
     });
     let device = null;
     try {
-      const name = typeof body?.deviceName === "string" ? body.deviceName.slice(0, 100) : null;
-      const preset = body?.readOnly === true ? "read-only" : "full";
+      const name = registration ? registration.deviceName : typeof body?.deviceName === "string" ? body.deviceName.slice(0, 100) : null;
+      const readOnly = registration ? registration.readOnly : body?.readOnly === true;
+      const preset = readOnly ? "read-only" : "full";
       device = this.devicesRepo?.register({
         publicKey: clientPublicKey,
         name,
@@ -16747,23 +16808,34 @@ var StreamerServer = class {
         err
       });
     }
+    if (handshake && !device) {
+      this.log.error("[pair] E2EE pairing failed: the device could not be registered", {
+        event: "pair.e2ee_registration_failed",
+        ip
+      });
+      json(res, 500, {
+        error: "Pairing failed: this server could not register the device. Scan a fresh pairing code and try again.",
+        code: "E2EE_REGISTRATION_FAILED"
+      });
+      return;
+    }
     let e2eeResponse = null;
-    if (handshake) {
+    if (handshake && device) {
       try {
         const { message2 } = writeMessage2(
           handshake,
-          Buffer.from(
-            JSON.stringify({
-              v: E2EE_EXCHANGE_VERSION,
-              deviceId: device?.deviceId ?? null,
-              serverVersion: getVersion(),
-              // Always true on this path: completing a handshake is what pins
-              // the device, and design.md §6.3 says nothing a client sends
-              // ever clears it.
-              e2eeRequired: true
-            }),
-            "utf-8"
-          )
+          // Every result a new client persists or presents as verified, so it
+          // never has to trust the outer, unauthenticated copy of a credential.
+          // The outer response still carries those copies for released builds;
+          // this is what the new client actually reads.
+          encodeE2eeMsg2Payload({
+            deviceId: device.deviceId,
+            deviceToken: device.deviceToken,
+            capabilities: device.capabilities,
+            publicUrl: this.publicUrl,
+            machineName: (0, import_os14.hostname)(),
+            serverVersion: getVersion()
+          })
         );
         e2eeResponse = { v: E2EE_EXCHANGE_VERSION, noise: message2.toString("base64") };
       } catch (err) {