@freedomofpress/sigstore-browser 0.1.14 → 0.1.15

package/dist/tlog/hashedrekord.js

@@ -10,22 +10,24 @@
  * - Adds verifyHashedRekordV002Body() - new functionality (reference only supports v0.0.1)
  */
 import { base64ToUint8Array, hexToUint8Array, uint8ArrayEqual } from "@freedomofpress/crypto-browser";
-export async function verifyHashedRekordBody(entry, bundle) {
+import { assertLoggedCertificate } from "./body.js";
+export async function verifyHashedRekordBody(entry, bundle, cert) {
     const hashedRekordEntry = entry;
     switch (hashedRekordEntry.apiVersion) {
         case "0.0.1":
-            return verifyHashedRekordV001Body(hashedRekordEntry, bundle);
+            return verifyHashedRekordV001Body(hashedRekordEntry, bundle, cert);
         case "0.0.2":
-            return verifyHashedRekordV002Body(hashedRekordEntry, bundle);
+            return verifyHashedRekordV002Body(hashedRekordEntry, bundle, cert);
         default:
             throw new Error(`Unsupported hashedrekord version: ${hashedRekordEntry.apiVersion}`);
     }
 }
-function verifyHashedRekordV001Body(entry, bundle) {
+function verifyHashedRekordV001Body(entry, bundle, cert) {
     const spec = entry.spec;
     if (!bundle.messageSignature) {
         throw new Error("Bundle missing messageSignature for hashedrekord entry");
     }
+    assertLoggedCertificate(cert, spec.signature?.publicKey?.content, true);
     const tlogSig = spec.signature.content || "";
     const tlogSigBytes = base64ToUint8Array(tlogSig);
     const bundleSigBytes = base64ToUint8Array(bundle.messageSignature.signature);
@@ -40,11 +42,12 @@ function verifyHashedRekordV001Body(entry, bundle) {
     }
 }
 // New functionality for HashedRekord v0.0.2 (not in sigstore-js reference, which only supports v0.0.1)
-function verifyHashedRekordV002Body(entry, bundle) {
+function verifyHashedRekordV002Body(entry, bundle, cert) {
     const spec = entry.spec.hashedRekordV002;
     if (!bundle.messageSignature) {
         throw new Error("Bundle missing messageSignature for hashedrekord v0.0.2 entry");
     }
+    assertLoggedCertificate(cert, spec?.signature?.verifier?.x509Certificate?.rawBytes, false);
     // NOTE: HashedRekord v0.0.2 uses single base64 encoding (unlike intoto which is double-encoded)
     // Verified against Sigstore conformance test suite bundles
     const tlogSig = spec.signature.content || "";

package/dist/tlog/hashedrekord.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashedrekord.js","sourceRoot":"","sources":["../../src/tlog/hashedrekord.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hashedrekord.js","sourceRoot":"","sources":["../../src/tlog/hashedrekord.ts"],"names":[],"mappings":"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"}

package/dist/tlog/intoto.d.ts

@@ -1,4 +1,5 @@
 import type { SigstoreBundle } from "../bundle.js";
-import type { RekorEntry } from "./body.js";
-export declare function verifyIntotoBody(entry: RekorEntry, bundle: SigstoreBundle): Promise<void>;
+import type { X509Certificate } from "../x509/cert.js";
+import { type RekorEntry } from "./body.js";
+export declare function verifyIntotoBody(entry: RekorEntry, bundle: SigstoreBundle, cert: X509Certificate): Promise<void>;
 //# sourceMappingURL=intoto.d.ts.map

package/dist/tlog/intoto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intoto.d.ts","sourceRoot":"","sources":["../../src/tlog/intoto.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAiC5C,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAsDf"}
+{"version":3,"file":"intoto.d.ts","sourceRoot":"","sources":["../../src/tlog/intoto.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAiCrE,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,IAAI,CAAC,CAuDf"}

package/dist/tlog/intoto.js

@@ -11,7 +11,8 @@
  */
 import { base64Decode, base64ToUint8Array, hexToUint8Array, uint8ArrayEqual } from "@freedomofpress/crypto-browser";
 import { getHashAlgorithm } from "../interfaces.js";
-export async function verifyIntotoBody(entry, bundle) {
+import { assertLoggedCertificate } from "./body.js";
+export async function verifyIntotoBody(entry, bundle, cert) {
     const intotoEntry = entry;
     if (intotoEntry.apiVersion !== "0.0.2") {
         throw new Error(`Unsupported intoto version: ${intotoEntry.apiVersion}`);
@@ -23,6 +24,7 @@ export async function verifyIntotoBody(entry, bundle) {
     if (!tlogEnvelope.signatures || tlogEnvelope.signatures.length !== 1) {
         throw new Error("Intoto entry must have exactly one signature");
     }
+    assertLoggedCertificate(cert, tlogEnvelope.signatures[0].publicKey, true);
     // The signature in the intoto tlog entry is double-base64-encoded:
     // 1. Raw signature bytes are base64-encoded (normal)
     // 2. That base64 string is base64-encoded again (for storage in JSON)

package/dist/tlog/intoto.js.map

@@ -1 +1 @@
-{"version":3,"file":"intoto.js","sourceRoot":"","sources":["../../src/tlog/intoto.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACpH,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmCpD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAiB,EACjB,MAAsB;IAEtB,MAAM,WAAW,GAAG,KAAoB,CAAC;IAEzC,IAAI,WAAW,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CACb,+BAA+B,WAAW,CAAC,UAAU,EAAE,CACxD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAEvD,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,mEAAmE;IACnE,qDAAqD;IACrD,sEAAsE;IACtE,0DAA0D;IAC1D,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,+DAA+D;IACnH,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,4CAA4C;IAErG,IAAI,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,cAAc,GAAG,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAEjF,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,cAAc,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAElF,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,IAAI,UAAU,CACpC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAA4B,CAAC,CAClE,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"intoto.js","sourceRoot":"","sources":["../../src/tlog/intoto.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACpH,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,EAAE,uBAAuB,EAAmB,MAAM,WAAW,CAAC;AAiCrE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAiB,EACjB,MAAsB,EACtB,IAAqB;IAErB,MAAM,WAAW,GAAG,KAAoB,CAAC;IAEzC,IAAI,WAAW,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CACb,+BAA+B,WAAW,CAAC,UAAU,EAAE,CACxD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAEvD,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IACD,uBAAuB,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE1E,mEAAmE;IACnE,qDAAqD;IACrD,sEAAsE;IACtE,0DAA0D;IAC1D,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,+DAA+D;IACnH,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,4CAA4C;IAErG,IAAI,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,cAAc,GAAG,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAEjF,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,cAAc,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAElF,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,IAAI,UAAU,CACpC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAA4B,CAAC,CAClE,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freedomofpress/sigstore-browser",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "A minimal browser-only Sigstore verification library.",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@freedomofpress/crypto-browser": "^0.1.7",
+    "@freedomofpress/crypto-browser": "^0.1.8",
     "@freedomofpress/tuf-browser": "^0.1.11",
     "@noble/curves": "^2.0.1"
   }

package/src/bundle.ts

@@ -97,3 +97,90 @@ export interface InTotoSubject {
   name: string;
   digest: Record<string, string>;
 }
+
+const isStr = (v: unknown): v is string => typeof v === "string";
+// Bound the aggregate encoded data this verifier will decode, parse, or hash.
+const MAX_BUNDLE_STRING_CHARS = 16 * 1024 * 1024;
+function boundedStrings(): (v: unknown) => v is string {
+  let total = 0;
+  return (v: unknown): v is string => {
+    if (!isStr(v)) return false;
+    total += v.length;
+    return total <= MAX_BUNDLE_STRING_CHARS;
+  };
+}
+// Protobuf log indices, tree sizes and times are non-negative int64 values.
+// Bound the string before BigInt conversion to avoid unbounded arithmetic.
+const isInt64 = (v: unknown): v is string =>
+  isStr(v) && /^\d{1,19}$/.test(v) && BigInt(v) <= 9223372036854775807n;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const isObj = (v: unknown): v is Record<string, any> => typeof v === "object" && v !== null;
+
+function check(cond: unknown, what: string): asserts cond {
+  if (!cond) throw new Error(`Invalid bundle: ${what}`);
+}
+
+function checkTimestampVerificationData(
+  data: unknown,
+  isBoundedStr: (v: unknown) => v is string,
+): void {
+  if (data == null) return;
+  check(isObj(data), "timestampVerificationData");
+  const ts = data.rfc3161Timestamps;
+  check(
+    ts === undefined || (Array.isArray(ts) && ts.length <= 32 && ts.every((t: unknown) => isObj(t) && isBoundedStr(t.signedTimestamp))),
+    "rfc3161Timestamps",
+  );
+}
+
+// Lives in verifyBundleTimestamp(), which every caller routes through.
+export function assertTimestampVerificationData(data: unknown): void {
+  checkTimestampVerificationData(data, boundedStrings());
+}
+
+// Structural validation of a parsed bundle, replacing the compile-time-only type with runtime checks.
+// Entry count is capped at 32 like sigstore-go does.
+export function assertBundle(b: unknown): asserts b is SigstoreBundle {
+  const isBoundedStr = boundedStrings();
+  check(isObj(b) && isBoundedStr(b.mediaType) && isObj(b.verificationMaterial), "missing mediaType or verificationMaterial");
+  const vm = b.verificationMaterial;
+
+  const certs = vm.certificate ? [vm.certificate] : vm.x509CertificateChain?.certificates;
+  check(Array.isArray(certs) && certs.length > 0 && certs.length <= 32 && certs.every((c: unknown) => isObj(c) && isBoundedStr(c.rawBytes)), "certificate");
+
+  check(Array.isArray(vm.tlogEntries) && vm.tlogEntries.length > 0 && vm.tlogEntries.length <= 32, "tlogEntries");
+  for (const e of vm.tlogEntries) {
+    check(isObj(e) && isInt64(e.logIndex) && isBoundedStr(e.logId?.keyId) && isBoundedStr(e.canonicalizedBody), "tlog entry");
+    check(isBoundedStr(e.kindVersion?.kind) && isBoundedStr(e.kindVersion?.version), "tlog entry kindVersion");
+    check(
+      e.integratedTime == null || (isInt64(e.integratedTime) && Number.isFinite(new Date(Number(e.integratedTime) * 1000).getTime())),
+      "tlog entry integratedTime",
+    );
+    // A SET signs the integrated time, so a promise without one is malformed.
+    // SET canonicalization uses Number, which must not round the signed log index.
+    const set = e.inclusionPromise?.signedEntryTimestamp;
+    check(
+      e.inclusionPromise === undefined || (isBoundedStr(set) && set !== "" && isInt64(e.integratedTime) && Number.isSafeInteger(Number(e.logIndex))),
+      "inclusion promise",
+    );
+    const p = e.inclusionProof;
+    // An int64-sized tree requires at most 63 sibling hashes.
+    check(
+      p === undefined ||
+        (isObj(p) && isInt64(p.logIndex) && isInt64(p.treeSize) && isBoundedStr(p.rootHash) &&
+          Array.isArray(p.hashes) && p.hashes.length <= 63 && p.hashes.every(isBoundedStr) && isBoundedStr(p.checkpoint?.envelope)),
+      "inclusion proof",
+    );
+  }
+
+  checkTimestampVerificationData(vm.timestampVerificationData, isBoundedStr);
+
+  const { messageSignature: ms, dsseEnvelope: env } = b;
+  check((ms === undefined) !== (env === undefined), "exactly one of messageSignature or dsseEnvelope");
+  if (ms !== undefined) {
+    check(isObj(ms) && isBoundedStr(ms.signature) && isBoundedStr(ms.messageDigest?.algorithm) && isBoundedStr(ms.messageDigest?.digest), "messageSignature");
+  } else {
+    check(isObj(env) && isBoundedStr(env.payload) && isBoundedStr(env.payloadType), "dsseEnvelope");
+    check(Array.isArray(env.signatures) && env.signatures.length === 1 && isBoundedStr(env.signatures[0]?.sig), "dsseEnvelope must have exactly one signature");
+  }
+}

package/src/ed25519.browser.test.ts

@@ -0,0 +1,76 @@
+import { describe, expect, it } from "vitest";
+
+// Replace crypto.subtle with a wrapper whose Ed25519 operations throw NotSupportedError, as browsers without native
+// Ed25519 do. It must be in place before crypto-browser is first imported, because it probes once and caches the result.
+const real = globalThis.crypto.subtle;
+const noEd25519 = new Proxy(real, {
+  get(target, prop) {
+    const value = Reflect.get(target, prop) as unknown;
+    if (typeof value !== "function") return value;
+    return (...args: unknown[]) => {
+      const alg = (prop === "importKey" ? args[2] : args[0]) as { name?: string } | undefined;
+      if (alg?.name === "Ed25519") {
+        return Promise.reject(new DOMException("Unrecognized name.", "NotSupportedError"));
+      }
+      return (value as (...a: unknown[]) => unknown).apply(target, args);
+    };
+  },
+});
+Object.defineProperty(globalThis.crypto, "subtle", { value: noEd25519, configurable: true });
+
+describe("Fix 7: Ed25519 log keys without native WebCrypto support", () => {
+  it("imports trusted root Ed25519 keys through the fallback and verifies a checkpoint", async () => {
+    await expect(crypto.subtle.generateKey({ name: "Ed25519" }, false, ["sign", "verify"])).rejects.toThrow();
+
+    const { SigstoreVerifier } = await import("./sigstore.js");
+    const { verifyCheckpoint } = await import("./tlog/checkpoint.js");
+    const { Uint8ArrayToBase64 } = await import("@freedomofpress/crypto-browser");
+    const { ed25519 } = await import("@noble/curves/ed25519.js");
+    const { trustRoot } = await import("../test/fixtures/sigstore.js");
+
+    // The real trusted root carries an SPKI-encoded Ed25519 key for Rekor v2.
+    const keys = await new SigstoreVerifier().loadLog(trustRoot().tlogs);
+    const rekorV2 = keys.find((k) => k.publicKey.algorithm.name === "Ed25519");
+    expect((rekorV2?.publicKey as unknown as { bytes: Uint8Array }).bytes).toHaveLength(32);
+
+    // A synthetic log whose key we control, signing a checkpoint note.
+    const priv = ed25519.utils.randomSecretKey();
+    const pub = ed25519.getPublicKey(priv);
+    const spki = new Uint8Array([0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03, 0x21, 0x00, ...pub]);
+    const logId = new Uint8Array(await crypto.subtle.digest("SHA-256", spki));
+    const [log] = await new SigstoreVerifier().loadLog([
+      {
+        baseUrl: "https://log.test",
+        hashAlgorithm: "SHA2_256",
+        publicKey: { rawBytes: Uint8ArrayToBase64(spki), keyDetails: "PKIX_ED25519", validFor: { start: "2025-01-01T00:00:00Z" } },
+        logId: { keyId: Uint8ArrayToBase64(logId) },
+      },
+    ]);
+
+    const rootHash = Uint8ArrayToBase64(new Uint8Array(32));
+    const note = `log.test\n7\n${rootHash}\n`;
+    const sig = ed25519.sign(new TextEncoder().encode(note), priv);
+    const sigLine = Uint8ArrayToBase64(new Uint8Array([...logId.subarray(0, 4), ...sig]));
+    const proof = (n: string) => ({
+      logIndex: "0",
+      hashes: [],
+      treeSize: "7",
+      rootHash,
+      checkpoint: { envelope: `${n}\n— log.test ${sigLine}\n` },
+    });
+    const entry = (n = note) => ({
+      logIndex: "0",
+      logId: { keyId: Uint8ArrayToBase64(logId) },
+      kindVersion: { kind: "dsse", version: "0.0.2" },
+      integratedTime: null,
+      canonicalizedBody: "",
+      inclusionProof: proof(n),
+    });
+
+    await expect(verifyCheckpoint(entry(), log)).resolves.toBeUndefined();
+    await expect(verifyCheckpoint(entry(`log.test\n8\n${rootHash}\n`), log)).rejects.toThrow("Invalid checkpoint signature");
+    const bad = entry();
+    bad.inclusionProof.treeSize = "8";
+    await expect(verifyCheckpoint(bad, log)).rejects.toThrow("does not match inclusion proof");
+  });
+});

package/src/index.browser.test.ts

@@ -1,5 +1,7 @@
-import { describe, it, expect } from "vitest";
-import { SigstoreVerifier, assertRekorV2Timestamp } from "./sigstore.js";
+import { describe, expect,it } from "vitest";
+
+import { assertBundle } from "./bundle.js";
+import { SigstoreVerifier } from "./sigstore.js";
 import { X509Certificate } from "./x509/cert.js";
 
 describe("Sigstore Browser Integration Tests", () => {
@@ -255,36 +257,45 @@ ewS+2T7Qz4oXaQMidPOjr1Q8WKqaKO4yCtC8cz4qVWi3lNqAcAGtonQMXUiflEWV
   });
 });
 
-describe("Rekor v2 observer-timestamp enforcement", () => {
-  // Regression test: a Rekor-v2-shaped bundle (no integratedTime in the tlog
-  // entry) must carry a signed RFC3161 timestamp. A previous guard only checked
-  // that `timestampVerificationData` was present, which an empty object ({})
-  // satisfies in JavaScript — letting a crafted bundle pass verification with
-  // zero verified timestamps and the signing certificate's validity window left
-  // completely unanchored in time.
-
-  it("rejects a missing timestampVerificationData", () => {
-    expect(() => assertRekorV2Timestamp(undefined)).toThrow(
-      "Rekor v2 bundles require a timestamp for verification.",
-    );
+describe("Bundle structural validation", () => {
+  const entry = {
+    logIndex: "1",
+    logId: { keyId: "AA==" },
+    kindVersion: { kind: "dsse", version: "0.0.1" },
+    integratedTime: "1",
+    inclusionPromise: { signedEntryTimestamp: "AA==" },
+    canonicalizedBody: "e30=",
+  };
+  const bundle = () => structuredClone({
+    mediaType: "application/vnd.dev.sigstore.bundle.v0.3+json",
+    verificationMaterial: { certificate: { rawBytes: "AA==" }, tlogEntries: [entry] },
+    dsseEnvelope: { payload: "AA==", payloadType: "t", signatures: [{ sig: "AA==" }] },
+  });
+  const rejects = (mutate: (b: ReturnType<typeof bundle>) => void, message: string) => {
+    const b = bundle();
+    mutate(b);
+    expect(() => assertBundle(b)).toThrow(message);
+  };
+
+  it("accepts a well-formed bundle", () => {
+    expect(() => assertBundle(bundle())).not.toThrow();
   });
 
-  it("rejects an empty timestampVerificationData object ({})", () => {
-    // This is the exact bypass the fix closes: {} is truthy.
-    expect(() => assertRekorV2Timestamp({})).toThrow(
-      "Rekor v2 bundles require a timestamp for verification.",
-    );
+  it("rejects malformed fields, empty promises and missing integrated times", () => {
+    rejects((b) => { b.verificationMaterial.tlogEntries = []; }, "tlogEntries");
+    rejects((b) => { (b.verificationMaterial.tlogEntries[0] as Record<string, unknown>).logIndex = 1; }, "tlog entry");
+    rejects((b) => { (b.verificationMaterial.tlogEntries[0] as Record<string, unknown>).integratedTime = 1; }, "integratedTime");
+    rejects((b) => { b.verificationMaterial.tlogEntries[0].inclusionPromise.signedEntryTimestamp = ""; }, "inclusion promise");
+    rejects((b) => { (b.verificationMaterial.tlogEntries[0] as Record<string, unknown>).integratedTime = null; }, "inclusion promise");
   });
 
-  it("rejects timestampVerificationData with an empty rfc3161Timestamps array", () => {
-    expect(() =>
-      assertRekorV2Timestamp({ rfc3161Timestamps: [] }),
-    ).toThrow("Rekor v2 bundles require a timestamp for verification.");
+  it("caps entries at 32", () => {
+    rejects((b) => { b.verificationMaterial.tlogEntries = Array(33).fill(entry); }, "tlogEntries");
   });
 
-  it("accepts timestampVerificationData with at least one RFC3161 timestamp", () => {
-    expect(() =>
-      assertRekorV2Timestamp({ rfc3161Timestamps: [{ signedTimestamp: "…" }] }),
-    ).not.toThrow();
+  it("requires exactly one signature source with exactly one signature", () => {
+    rejects((b) => { (b as Record<string, unknown>).messageSignature = { messageDigest: { algorithm: "SHA2_256", digest: "AA==" }, signature: "AA==" }; }, "exactly one of");
+    rejects((b) => { delete (b as Partial<ReturnType<typeof bundle>>).dsseEnvelope; }, "exactly one of");
+    rejects((b) => { b.dsseEnvelope.signatures.push({ sig: "AA==" }); }, "exactly one signature");
   });
 });

package/src/interfaces.ts

@@ -1,5 +1,24 @@
 import { X509Certificate } from "./x509/index.js";
 
+export function parseValidityPeriod(
+  validity: { start?: unknown; end?: unknown } | undefined,
+): { start: Date; end: Date } {
+  if (
+    typeof validity?.start !== "string" ||
+    (validity.end !== undefined && typeof validity.end !== "string")
+  ) {
+    throw new Error("Invalid authority validity period");
+  }
+  const start = new Date(validity.start);
+  const end = validity.end === undefined
+    ? new Date(8640000000000000)
+    : new Date(validity.end);
+  if (!Number.isFinite(start.getTime()) || !Number.isFinite(end.getTime()) || start > end) {
+    throw new Error("Invalid authority validity period");
+  }
+  return { start, end };
+}
+
 export enum SigstoreRoots {
   certificateAuthorities = "certificateAuthorities",
   ctlogs = "ctlogs",
@@ -31,11 +50,13 @@ export interface RawTimestampAuthority {
     start: string;
     end?: string;
   };
+  operator?: string;
 }
 
 export interface CTLog {
   logID: Uint8Array;
   publicKey: CryptoKey;
+  operator: string;
   validFor: {
     start: Date;
     end: Date;
@@ -45,6 +66,12 @@ export interface CTLog {
 export interface RekorKeyInfo {
   publicKey: CryptoKey;
   logId: Uint8Array;
+  hashAlgorithm: string;
+  operator: string;
+  validFor: {
+    start: Date;
+    end: Date;
+  };
 }
 
 export interface CertAuthority {
@@ -56,10 +83,9 @@ export interface CertAuthority {
 }
 
 export interface Sigstore {
-  rekor: RekorKeyInfo | undefined;
+  rekor: RekorKeyInfo[];
   ctlogs: CTLog[];
   certificateAuthorities: CertAuthority[];
-  timestampAuthorities: CertAuthority[];
 }
 
 export interface RawLog {
@@ -76,6 +102,7 @@ export interface RawLog {
   logId: {
     keyId: string;
   };
+  operator?: string;
 }
 
 export type RawLogs = RawLog[];

package/src/policy.ts

@@ -49,7 +49,7 @@ export const GITHUB_OIDC_ISSUER = "https://token.actions.githubusercontent.com";
  * Interface that all verification policies conform to.
  */
 export interface VerificationPolicy {
-  verify(cert: X509Certificate): void;
+  verify(cert: X509Certificate): void | Promise<void>;
 }
 
 /**
@@ -384,10 +384,10 @@ export class AnyOf implements VerificationPolicy {
     this.children = children;
   }
 
-  verify(cert: X509Certificate): void {
+  async verify(cert: X509Certificate): Promise<void> {
     for (const child of this.children) {
       try {
-        child.verify(cert);
+        await child.verify(cert);
         return;
       } catch {
         // Continue to next policy
@@ -408,12 +408,12 @@ export class AllOf implements VerificationPolicy {
     this.children = children;
   }
 
-  verify(cert: X509Certificate): void {
+  async verify(cert: X509Certificate): Promise<void> {
     if (this.children.length < 1) {
       throw new PolicyError("no child policies to verify");
     }
     for (const child of this.children) {
-      child.verify(cert);
+      await child.verify(cert);
     }
   }
 }