@orangecheck/me-client 0.32.1 → 0.32.3

package/dist/index.mjs

@@ -1232,33 +1232,85 @@ async function verifyEd255192(key, sig, msg) {
     return false;
   }
 }
+var SIGNED_FIELDS = [
+  "v",
+  "kind",
+  "did_oc",
+  "event_count",
+  "human_event_count",
+  "lifetime_sats",
+  "distinct_integrator_count",
+  "oldest_event_at",
+  "active_days",
+  "computed_at",
+  "expires_at"
+];
+var COUNTS = [
+  "event_count",
+  "human_event_count",
+  "lifetime_sats",
+  "distinct_integrator_count",
+  "active_days"
+];
+function readSignedAttestation(canonical, id) {
+  const text = new TextDecoder().decode(canonical);
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  const o = parsed;
+  if (o.v !== 1 || o.kind !== "oc-me-activity" || typeof o.did_oc !== "string") return null;
+  const countsOk = COUNTS.every((k) => {
+    const n = o[k];
+    return typeof n === "number" && Number.isSafeInteger(n) && n >= 0;
+  });
+  if (!countsOk) return null;
+  if (o.oldest_event_at !== null && typeof o.oldest_event_at !== "string") return null;
+  if (typeof o.computed_at !== "string" || typeof o.expires_at !== "string") return null;
+  const ordered = Object.fromEntries(SIGNED_FIELDS.map((k) => [k, o[k]]));
+  if (JSON.stringify(ordered) !== text) return null;
+  return { id, ...ordered };
+}
+function sameAttestation(copy, signed) {
+  const c = copy;
+  const v = signed;
+  return ["id", ...SIGNED_FIELDS].every((k) => c[k] === v[k]);
+}
 async function verifyActivityAttestation(bundle, options = {}) {
   const checks = [];
-  const shapeOk = !!bundle && typeof bundle === "object" && typeof bundle.sig === "string" && typeof bundle.kid === "string" && typeof bundle.canonical_b64 === "string" && !!bundle.attestation && typeof bundle.attestation.id === "string" && typeof bundle.attestation.expires_at === "string";
+  const shapeOk = !!bundle && typeof bundle === "object" && typeof bundle.sig === "string" && typeof bundle.kid === "string" && typeof bundle.canonical_b64 === "string" && (bundle.attestation === void 0 || !!bundle.attestation && typeof bundle.attestation === "object");
   checks.push({
     ok: shapeOk,
-    label: "bundle shape \xB7 sig / kid / canonical_b64 / attestation"
+    label: "bundle shape \xB7 sig / kid / canonical_b64"
   });
   if (!shapeOk) {
     return { ok: false, reason: "bundle shape invalid", checks };
   }
-  const a = bundle.attestation;
   const canonical = base64ToBytes(bundle.canonical_b64);
   checks.push({
     ok: canonical !== null,
     label: "canonical_b64 decodes",
     detail: canonical ? `${canonical.length} bytes` : "invalid base64"
   });
-  if (!canonical) return { ok: false, reason: "canonical_b64 invalid base64", checks, attestation: a };
-  const digest = await sha256(canonical);
-  const computedId = bytesToHex(digest);
-  const idOk = computedId === a.id;
+  if (!canonical) return { ok: false, reason: "canonical_b64 invalid base64", checks };
+  const computedId = bytesToHex(await sha256(canonical));
+  const signed = readSignedAttestation(canonical, computedId);
+  checks.push({
+    ok: signed !== null,
+    label: "canonical_bytes are an oc-me-activity attestation in canonical form"
+  });
+  if (!signed) return { ok: false, reason: "canonical bytes are not an activity attestation", checks };
+  const copy = bundle.attestation;
+  const copyOk = copy === void 0 || sameAttestation(copy, signed);
   checks.push({
-    ok: idOk,
-    label: "sha256(canonical_bytes) === id",
-    detail: idOk ? a.id : `expected ${a.id}, got ${computedId}`
+    ok: copyOk,
+    label: "attestation === the signed bytes, id = sha256(canonical_bytes)",
+    detail: copyOk ? computedId : "the readable copy differs from what was signed"
   });
-  if (!idOk) return { ok: false, reason: "id does not match canonical-bytes hash", checks, attestation: a };
+  if (!copyOk) return { ok: false, reason: "attestation does not match the signed bytes", checks };
   let key = null;
   if (options.jwk) {
     if (options.jwk.kid !== bundle.kid) {
@@ -1267,7 +1319,7 @@ async function verifyActivityAttestation(bundle, options = {}) {
         label: "JWK with matching kid present",
         detail: `provided jwk.kid=${options.jwk.kid} but bundle.kid=${bundle.kid}`
       });
-      return { ok: false, reason: "kid mismatch with provided jwk", checks, attestation: a };
+      return { ok: false, reason: "kid mismatch with provided jwk", checks };
     }
     try {
       key = await importJWK(options.jwk, "EdDSA");
@@ -1278,7 +1330,7 @@ async function verifyActivityAttestation(bundle, options = {}) {
         label: "JWK with matching kid present",
         detail: `provided jwk failed import: ${err.message}`
       });
-      return { ok: false, reason: "provided jwk failed import", checks, attestation: a };
+      return { ok: false, reason: "provided jwk failed import", checks };
     }
   } else {
     const issuer = options.issuer ?? DEFAULT_ISSUER2;
@@ -1297,7 +1349,7 @@ async function verifyActivityAttestation(bundle, options = {}) {
         detail: key ? `kid ${bundle.kid}` : `no JWK with kid ${bundle.kid} at ${issuer}${ENVELOPE_JWKS_PATH}`
       });
       if (!key) {
-        return { ok: false, reason: `kid ${bundle.kid} not in envelope JWKS`, checks, attestation: a };
+        return { ok: false, reason: `kid ${bundle.kid} not in envelope JWKS`, checks };
       }
     } catch (err) {
       checks.push({
@@ -1308,8 +1360,7 @@ async function verifyActivityAttestation(bundle, options = {}) {
       return {
         ok: false,
         reason: `envelope JWKS unavailable: ${err.message}`,
-        checks,
-        attestation: a
+        checks
       };
     }
   }
@@ -1320,7 +1371,7 @@ async function verifyActivityAttestation(bundle, options = {}) {
       label: "ed25519.verify(sig, canonical_bytes, jwk.public)",
       detail: "malformed sig (expected hex)"
     });
-    return { ok: false, reason: "malformed sig", checks, attestation: a };
+    return { ok: false, reason: "malformed sig", checks };
   }
   const sigOk = await verifyEd255192(key, sigBytes, canonical);
   checks.push({
@@ -1328,17 +1379,17 @@ async function verifyActivityAttestation(bundle, options = {}) {
     label: "ed25519.verify(sig, canonical_bytes, jwk.public)",
     detail: sigOk ? "signature valid" : "signature does not match"
   });
-  if (!sigOk) return { ok: false, reason: "signature does not match", checks, attestation: a };
+  if (!sigOk) return { ok: false, reason: "signature does not match", checks };
   const now = options.now ?? /* @__PURE__ */ new Date();
-  const expiresMs = Date.parse(a.expires_at);
+  const expiresMs = Date.parse(signed.expires_at);
   const freshOk = Number.isFinite(expiresMs) && expiresMs > now.getTime();
   checks.push({
     ok: freshOk,
     label: "now < attestation.expires_at",
     detail: freshOk ? `expires ${new Date(expiresMs).toISOString()}` : "attestation has expired"
   });
-  if (!freshOk) return { ok: false, reason: "attestation has expired", checks, attestation: a };
-  return { ok: true, attestation: a, checks };
+  if (!freshOk) return { ok: false, reason: "attestation has expired", checks };
+  return { ok: true, attestation: signed, checks };
 }
 async function refreshEnvelopeJwks(issuer = DEFAULT_ISSUER2) {
   jwksCache2.delete(issuer);