fedipod-server 0.9.0 → 0.11.0

package/lib/httpsig.mjs

@@ -89,7 +89,33 @@ export async function verifyHttpSignature(request, { documentLoader, keyCache, t
 // even while the inbox is still public-Append (a forger without the secret
 // cannot mint `verified: true`). The HMAC is over the receipt minus the hmac
 // field itself, with sorted keys so gateway and drain canonicalize alike.
+//
+// JSON.stringify's replacer ARRAY applies at EVERY level, not just the top: the
+// old canonical() passed the top-level key names, so `checks` — whose own keys
+// are `signature`, `digest`, `dateSkew`, `keyFetched` — serialized as `{}` and
+// was covered by no signature at all. Anything nested was equally unstamped.
+// Sort recursively instead, and exclude `hmac` only where it actually lives.
+function sortedKeys(v) {
+  if (Array.isArray(v)) return v.map(sortedKeys);
+  if (v && typeof v === 'object') {
+    const out = {};
+    for (const k of Object.keys(v).sort()) out[k] = sortedKeys(v[k]);
+    return out;
+  }
+  return v;
+}
 function canonical(obj) {
+  const { hmac, ...rest } = obj;       // eslint-disable-line no-unused-vars
+  return JSON.stringify(sortedKeys(rest));
+}
+
+// What canonical() used to produce. Kept ONLY for verification, and only until
+// every door has been redeployed: a gateway (fedipod.net) and an agent update
+// independently, so for a while a receipt signed by an old door has to keep
+// verifying against a new drain. Receipts are short-lived — one per inbox item,
+// deleted with the item — so this can go once the doors have turned over.
+// Nothing signs with it.
+function canonicalLegacy(obj) {
   return JSON.stringify(obj, Object.keys(obj).filter(k => k !== 'hmac').sort());
 }
 
@@ -117,8 +143,13 @@ export function signReceipt(receipt, secret) {
 // over equal-length buffers; unequal lengths are a straight mismatch.
 export function verifyReceipt(receipt, secret) {
   if (!receipt || typeof receipt !== 'object' || !receipt.hmac || !secret) return false;
-  const expected = crypto.createHmac('sha256', secret).update(canonical(receipt)).digest();
   let given;
   try { given = Buffer.from(receipt.hmac, 'base64'); } catch { return false; }
-  return given.length === expected.length && crypto.timingSafeEqual(given, expected);
+  const matches = (text) => {
+    const expected = crypto.createHmac('sha256', secret).update(text).digest();
+    return given.length === expected.length && crypto.timingSafeEqual(given, expected);
+  };
+  // The current stamp first; the pre-2026-09-09 one second, for receipts a door
+  // that has not been redeployed yet is still writing. See canonicalLegacy.
+  return matches(canonical(receipt)) || matches(canonicalLegacy(receipt));
 }

package/lib/import.mjs

@@ -157,7 +157,7 @@ export class ImportWorker {
   start() {
     if (this.timer) return;
     this.timer = setInterval(() => this.tick().catch(e => this.log(`import tick: ${e.message}`)), TICK_MS);
-    this.timer.unref();
+    this.timer.unref?.();     // a browser's setInterval returns a number
   }
 
   stop() {