@adcp/sdk 16.0.0-beta.3 → 16.0.0-beta.5

package/dist/lib/signing/signer.mjs

@@ -5,7 +5,7 @@ import {
   buildSignatureBase,
   formatSignatureParams
 } from "./canonicalize.mjs";
-import { computeContentDigest } from "./content-digest.mjs";
+import { computeContentDigest, serializeByteSequenceMember } from "./content-digest.mjs";
 import { RequestSignatureError, ResponseSignatureError, WebhookSignatureError } from "./errors.mjs";
 import {
   MANDATORY_COMPONENTS,
@@ -59,6 +59,7 @@ function prepareRequestSignature(request, identity, options = {}) {
   const windowSeconds = Math.min(options.windowSeconds ?? 300, MAX_SIGNATURE_WINDOW_SECONDS);
   const nonce = options.nonce ?? base64UrlRandom(16);
   const label = options.label ?? "sig1";
+  assertLabelAndClock(label, now);
   const hasBody = (request.body ?? "").length > 0;
   const binaryEncoding = options.binaryEncoding ?? "legacy-base64url";
   const coverDigest = options.coverContentDigest ?? binaryEncoding === "rfc8941-base64";
@@ -89,11 +90,8 @@ function prepareRequestSignature(request, identity, options = {}) {
 }
 function finalizeRequestSignature(prepared, signature) {
   const headers = { ...prepared.headers };
-  const sigB64 = Buffer.from(signature).toString(
-    prepared.binaryEncoding === "legacy-base64url" ? "base64url" : "base64"
-  );
   headers["Signature-Input"] = `${prepared.label}=${formatSignatureParams(prepared.components, prepared.params)}`;
-  headers["Signature"] = `${prepared.label}=:${sigB64}:`;
+  headers["Signature"] = serializeByteSequenceMember(prepared.label, signature, prepared.binaryEncoding);
   return { headers, signatureBase: prepared.base, params: prepared.params };
 }
 function signRequest(request, key, options = {}) {
@@ -115,6 +113,7 @@ function prepareWebhookSignature(request, identity, options = {}) {
   const windowSeconds = Math.min(options.windowSeconds ?? 300, MAX_SIGNATURE_WINDOW_SECONDS);
   const nonce = options.nonce ?? base64UrlRandom(16);
   const label = options.label ?? "sig1";
+  assertLabelAndClock(label, now);
   const headers = { ...flattenHeaders(request.headers) };
   headers["Content-Digest"] = computeContentDigest(request.body ?? "", "legacy-base64url");
   const components = [...WEBHOOK_MANDATORY_COMPONENTS];
@@ -141,6 +140,7 @@ function prepareResponseSignature(response, identity, options = {}) {
   const windowSeconds = Math.min(options.windowSeconds ?? 300, MAX_SIGNATURE_WINDOW_SECONDS);
   const nonce = options.nonce ?? base64UrlRandom(16);
   const label = options.label ?? "sig1";
+  assertLabelAndClock(label, now);
   const hasBody = (response.body ?? "").length > 0;
   const coverDigest = (options.coverContentDigest ?? true) && hasBody;
   const headers = { ...flattenHeaders(response.headers) };
@@ -169,9 +169,8 @@ function prepareResponseSignature(response, identity, options = {}) {
 }
 function finalizeResponseSignature(prepared, signature) {
   const headers = { ...prepared.headers };
-  const sigB64 = Buffer.from(signature).toString("base64url");
   headers["Signature-Input"] = `${prepared.label}=${formatSignatureParams(prepared.components, prepared.params)}`;
-  headers["Signature"] = `${prepared.label}=:${sigB64}:`;
+  headers["Signature"] = serializeByteSequenceMember(prepared.label, signature, "legacy-base64url");
   return { status: prepared.status, headers, signatureBase: prepared.base, params: prepared.params };
 }
 function signResponse(response, key, options = {}) {
@@ -191,6 +190,10 @@ function flattenHeaders(headers) {
   }
   return out;
 }
+function assertLabelAndClock(label, now) {
+  if (!/^[a-z*][a-z0-9_.*-]*$/.test(label)) throw new TypeError(`Signature label "${label}" is not an RFC 8941 key`);
+  if (!Number.isSafeInteger(now)) throw new TypeError("Signature clock must return integer epoch seconds");
+}
 function base64UrlRandom(byteLength) {
   return randomBytes(byteLength).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }

package/dist/lib/signing/web-bot-auth.js

@@ -51,6 +51,7 @@ module.exports = __toCommonJS(web_bot_auth_exports);
 var import_version = require('../version.js');
 var import_crypto = require("crypto");
 var import_structured_headers = require("structured-headers");
+var import_http_message_sig = require("http-message-sig");
 var import_net = require('../net/index.js');
 var import_etld = require('./agent-resolver/etld.js');
 var import_canonicalize = require('./agent-resolver/canonicalize.js');
@@ -176,11 +177,11 @@ function receivedAgentOrigin(value) {
   }
 }
 function buildWebBotAuthSignatureBase(input, request, response) {
-  const lines = input.components.map((component) => {
-    const bare = component.split(";", 1)[0];
+  const lines = input.components.map((component2) => {
+    const bare = component2.split(";", 1)[0];
     let identifier;
     try {
-      identifier = (0, import_structured_headers.parseItem)(`"${bare}"${component.slice(bare.length)}`);
+      identifier = (0, import_structured_headers.parseItem)(`"${bare}"${component2.slice(bare.length)}`);
     } catch {
       return bad("component");
     }
@@ -398,8 +399,8 @@ async function verifyWebBotAuth(request, options) {
         (c) => c.startsWith("signature-agent;key=") && !verified.some((s) => selected.find((i) => i.label === s.label).components.includes(c))
       );
       if (agentComponents.length !== 1) denied("agent_not_covered");
-      const component = (0, import_structured_headers.parseItem)(`"${agentComponents[0].replace("signature-agent;", 'signature-agent";')}`);
-      const memberKey = component[1].get("key");
+      const component2 = (0, import_structured_headers.parseItem)(`"${agentComponents[0].replace("signature-agent;", 'signature-agent";')}`);
+      const memberKey = component2[1].get("key");
       if (typeof memberKey !== "string" || memberKey !== input.label) bad("agent_member");
       const member = agents.get(memberKey);
       if (!member) denied("agent_not_covered");
@@ -667,7 +668,7 @@ class SignatureDirectoryResolver {
     return this.getVerifiedDirectory(origin)?.proof;
   }
 }
-async function signBase(base, key) {
+function webBotSigner(key) {
   const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
   const alg = algorithm(jwk);
   if (!["test", "development"].includes(process.env.NODE_ENV ?? "") && TEST_KIDS.has(jwkThumbprint(jwk)))
@@ -675,17 +676,40 @@ async function signBase(base, key) {
   if ("provider" in key) {
     if (key.provider.keyid !== jwkThumbprint(jwk) || key.provider.algorithm !== alg)
       throw new TypeError("Web Bot Auth provider identity does not match its public key");
-    return key.provider.sign(Buffer.from(base));
+    return { algorithm: alg, sign: async (data) => Buffer.from(await key.provider.sign(Buffer.from(data))) };
   }
   if (alg === "rsa-pss-sha512") {
     const privateKey = (0, import_crypto.createPrivateKey)({ key: jwk, format: "jwk" });
-    return (0, import_crypto.sign)("sha512", Buffer.from(base), {
-      key: privateKey,
-      padding: import_crypto.constants.RSA_PKCS1_PSS_PADDING,
-      saltLength: 64
-    });
+    return {
+      algorithm: alg,
+      sign: (data) => (0, import_crypto.sign)("sha512", Buffer.from(data), {
+        key: privateKey,
+        padding: import_crypto.constants.RSA_PKCS1_PSS_PADDING,
+        saltLength: 64
+      })
+    };
   }
-  return (0, import_crypto2.signWithPrivateJwkAsync)(alg, jwk, Buffer.from(base));
+  return { algorithm: alg, sign: (data) => (0, import_crypto2.signWithPrivateJwkAsync)(alg, jwk, Buffer.from(data)) };
+}
+async function createWebBotSignature(...args) {
+  try {
+    return await (0, import_http_message_sig.createSignature)(...args);
+  } catch (error) {
+    if ((0, import_http_message_sig.isSignatureError)(error)) throw new WebBotAuthError(400, "component_value");
+    throw error;
+  }
+}
+function componentDescriptor(identifier) {
+  const bare = identifier.split(";", 1)[0];
+  const [, params] = (0, import_structured_headers.parseItem)(`"${bare}"${identifier.slice(bare.length)}`);
+  return (0, import_http_message_sig.component)(bare, Object.fromEntries(params));
+}
+function coveredFields(components, headers) {
+  const names = new Set(components.filter((c) => !c.name.startsWith("@")).map((c) => c.name));
+  return [...names].flatMap((name) => {
+    const value = (0, import_canonicalize2.getHeaderValue)(headers, name);
+    return value === void 0 ? [] : [{ name, value }];
+  });
 }
 async function signWebBotAuth(request, key, options) {
   const origin = (0, import_canonicalize.canonicalAgentOrigin)(options.origin);
@@ -695,6 +719,7 @@ async function signWebBotAuth(request, key, options) {
   const now = Math.floor((options.now ?? (() => Date.now() / 1e3))());
   const window = options.windowSeconds ?? 300;
   const nonce = options.nonce ?? (0, import_crypto.randomBytes)(64).toString("base64url");
+  if (!Number.isSafeInteger(now)) throw new TypeError("Invalid Web Bot Auth clock");
   if (!Number.isInteger(window) || window < 1 || window > 300 || !/^[A-Za-z0-9_+\/-]{22,256}={0,2}$/.test(nonce))
     throw new TypeError("Invalid Web Bot Auth lifetime or nonce");
   if (!options.relay && ["signature", "signature-input", "signature-agent"].some(
@@ -707,42 +732,69 @@ async function signWebBotAuth(request, key, options) {
   for (const [name, value] of Object.entries(request.headers))
     if (value !== void 0 && !["signature", "signature-input", "signature-agent", "content-digest"].includes(name.toLowerCase()))
       headers[name.toLowerCase()] = Array.isArray(value) ? value.join(", ") : value;
-  const components = ['"@method"', '"@target-uri"', '"@authority"'];
+  const components = [(0, import_http_message_sig.component)("@method"), (0, import_http_message_sig.component)("@target-uri"), (0, import_http_message_sig.component)("@authority")];
   if (request.body !== void 0 && request.body !== "") {
     if (!(0, import_canonicalize2.getHeaderValue)(headers, "content-type"))
       throw new TypeError("Body-bearing Web Bot Auth requests need Content-Type");
     headers["content-digest"] = (0, import_content_digest.computeContentDigest)(request.body, "rfc8941-base64");
-    components.push('"content-type"', '"content-digest"');
+    components.push((0, import_http_message_sig.component)("content-type"), (0, import_http_message_sig.component)("content-digest"));
   }
   if (options.relay && ["signature", "signature-input", "signature-agent"].some((name) => !(0, import_canonicalize2.getHeaderValue)(request.headers, name)))
     throw new TypeError("Relay requires the existing signature fields");
   const earlier = options.relay ? inputs(request.headers) : [];
-  if (earlier.some((input2) => input2.label === label || input2.params.tag !== WEB_BOT_AUTH_PROFILE))
+  if (earlier.some((input) => input.label === label || input.params.tag !== WEB_BOT_AUTH_PROFILE))
     throw new TypeError("Relay requires existing Web Bot Auth signatures and a fresh label");
   const priorAgent = options.relay ? (0, import_canonicalize2.getHeaderValue)(request.headers, "signature-agent") : void 0;
   if (priorAgent) dictionary(priorAgent, "Signature-Agent");
   headers["signature-agent"] = `${priorAgent ? priorAgent + ", " : ""}${label}="${origin}"`;
-  components.push(`"signature-agent";key="${label}"`);
-  for (const inner of earlier) {
-    for (const component of inner.components) {
-      const bare = component.split(";", 1)[0];
-      const encoded = `"${bare}"${component.slice(bare.length)}`;
-      if (!components.includes(encoded)) components.push(encoded);
+  if (priorAgent) dictionary(headers["signature-agent"], "Signature-Agent");
+  components.push((0, import_http_message_sig.component)("signature-agent", { key: label }));
+  const covered = new Set(components.map(import_http_message_sig.componentIdentity));
+  const cover = (descriptor) => {
+    const identity = (0, import_http_message_sig.componentIdentity)(descriptor);
+    if (!covered.has(identity)) {
+      covered.add(identity);
+      components.push(descriptor);
     }
-    components.push(`"signature-input";key="${inner.label}"`, `"signature";key="${inner.label}"`);
+  };
+  for (const inner of earlier) {
+    for (const identifier of inner.components) cover(componentDescriptor(identifier));
+    cover((0, import_http_message_sig.component)("signature-input", { key: inner.label }));
+    cover((0, import_http_message_sig.component)("signature", { key: inner.label }));
   }
   const priorInput = options.relay ? (0, import_canonicalize2.getHeaderValue)(request.headers, "signature-input") : void 0;
   const priorSignature = options.relay ? (0, import_canonicalize2.getHeaderValue)(request.headers, "signature") : void 0;
   if (options.relay && (!priorInput || !priorSignature || !priorAgent))
     throw new TypeError("Relay requires the existing signature fields");
-  headers["signature-input"] = `${priorInput ? priorInput + ", " : ""}${label}=(${components.join(" ")});created=${now};expires=${now + window};nonce="${nonce}";keyid="${jwkThumbprint(jwk)}";alg="${algorithm(jwk)}";tag="web-bot-auth"`;
-  const input = (0, import_parser.parseSignatureInput)(headers["signature-input"], label);
+  if (priorInput) headers["signature-input"] = priorInput;
   if (priorSignature) headers.signature = priorSignature;
-  const bytes = await signBase(
-    buildWebBotAuthSignatureBase(input, { ...request, url: new URL(request.url).href, headers }),
-    key
+  for (const inner of earlier)
+    buildWebBotAuthSignatureBase(inner, { ...request, url: new URL(request.url).href, headers });
+  const targetUri = new URL(request.url);
+  targetUri.hash = "";
+  const signed = await createWebBotSignature(
+    {
+      kind: "request",
+      method: request.method.toUpperCase(),
+      targetUri: targetUri.href,
+      fields: coveredFields(components, headers)
+    },
+    {
+      label,
+      components,
+      parameters: {
+        created: now,
+        expires: now + window,
+        nonce,
+        keyid: jwkThumbprint(jwk),
+        alg: algorithm(jwk),
+        tag: WEB_BOT_AUTH_PROFILE
+      },
+      signer: webBotSigner(key)
+    }
   );
-  headers.signature = `${priorSignature ? priorSignature + ", " : ""}${label}=:${Buffer.from(bytes).toString("base64")}:`;
+  headers["signature-input"] = `${priorInput ? priorInput + ", " : ""}${signed.signatureInput}`;
+  headers.signature = `${priorSignature ? priorSignature + ", " : ""}${signed.signature}`;
   return headers;
 }
 async function createSignedSignatureDirectory(originUrl, signingKeys, options = {}) {
@@ -777,15 +829,29 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
   };
   const signatureInputs = [], signatures = [];
   for (let i = 0; i < keys.length; i++) {
-    const label = `key${i + 1}`;
-    const value = `${label}=("@authority";req "content-digest");created=${now - DIRECTORY_CLOCK_SKEW_SECONDS};expires=${now + lifetime};keyid="${keys[i].kid}";alg="${algorithm(keys[i])}";tag="${DIRECTORY_TAG}"`;
-    const input = (0, import_parser.parseSignatureInput)(value, label);
-    const bytes = await signBase(
-      buildWebBotAuthSignatureBase(input, { method: "GET", url: response.request.url, headers: {} }, response),
-      signingKeys[i]
+    const signed = await createWebBotSignature(
+      {
+        kind: "response",
+        status: response.status,
+        fields: coveredFields([(0, import_http_message_sig.component)("content-digest")], response.headers),
+        request: { kind: "request", method: "GET", targetUri: response.request.url, fields: [] }
+      },
+      {
+        label: `key${i + 1}`,
+        components: [(0, import_http_message_sig.component)("@authority", { req: true }), (0, import_http_message_sig.component)("content-digest")],
+        parameters: {
+          // Backdate created so verifiers whose clocks run slightly behind accept a fresh proof.
+          created: now - DIRECTORY_CLOCK_SKEW_SECONDS,
+          expires: now + lifetime,
+          keyid: keys[i].kid,
+          alg: algorithm(keys[i]),
+          tag: DIRECTORY_TAG
+        },
+        signer: webBotSigner(signingKeys[i])
+      }
     );
-    signatureInputs.push(value);
-    signatures.push(`${label}=:${Buffer.from(bytes).toString("base64")}:`);
+    signatureInputs.push(signed.signatureInput);
+    signatures.push(signed.signature);
   }
   response.headers["signature-input"] = signatureInputs.join(", ");
   response.headers.signature = signatures.join(", ");

package/dist/lib/signing/web-bot-auth.mjs

@@ -7,6 +7,12 @@ import {
   sign as nodeSign
 } from "crypto";
 import { parseDictionary, parseItem, serializeItem } from "structured-headers";
+import {
+  component,
+  componentIdentity,
+  createSignature,
+  isSignatureError
+} from "http-message-sig";
 import { ssrfSafeFetch } from "../net/index.mjs";
 import { eTldPlusOne } from "./agent-resolver/etld.mjs";
 import { canonicalAgentOrigin } from "./agent-resolver/canonicalize.mjs";
@@ -136,11 +142,11 @@ function receivedAgentOrigin(value) {
   }
 }
 function buildWebBotAuthSignatureBase(input, request, response) {
-  const lines = input.components.map((component) => {
-    const bare = component.split(";", 1)[0];
+  const lines = input.components.map((component2) => {
+    const bare = component2.split(";", 1)[0];
     let identifier;
     try {
-      identifier = parseItem(`"${bare}"${component.slice(bare.length)}`);
+      identifier = parseItem(`"${bare}"${component2.slice(bare.length)}`);
     } catch {
       return bad("component");
     }
@@ -358,8 +364,8 @@ async function verifyWebBotAuth(request, options) {
         (c) => c.startsWith("signature-agent;key=") && !verified.some((s) => selected.find((i) => i.label === s.label).components.includes(c))
       );
       if (agentComponents.length !== 1) denied("agent_not_covered");
-      const component = parseItem(`"${agentComponents[0].replace("signature-agent;", 'signature-agent";')}`);
-      const memberKey = component[1].get("key");
+      const component2 = parseItem(`"${agentComponents[0].replace("signature-agent;", 'signature-agent";')}`);
+      const memberKey = component2[1].get("key");
       if (typeof memberKey !== "string" || memberKey !== input.label) bad("agent_member");
       const member = agents.get(memberKey);
       if (!member) denied("agent_not_covered");
@@ -627,7 +633,7 @@ class SignatureDirectoryResolver {
     return this.getVerifiedDirectory(origin)?.proof;
   }
 }
-async function signBase(base, key) {
+function webBotSigner(key) {
   const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
   const alg = algorithm(jwk);
   if (!["test", "development"].includes(process.env.NODE_ENV ?? "") && TEST_KIDS.has(jwkThumbprint(jwk)))
@@ -635,17 +641,40 @@ async function signBase(base, key) {
   if ("provider" in key) {
     if (key.provider.keyid !== jwkThumbprint(jwk) || key.provider.algorithm !== alg)
       throw new TypeError("Web Bot Auth provider identity does not match its public key");
-    return key.provider.sign(Buffer.from(base));
+    return { algorithm: alg, sign: async (data) => Buffer.from(await key.provider.sign(Buffer.from(data))) };
   }
   if (alg === "rsa-pss-sha512") {
     const privateKey = createPrivateKey({ key: jwk, format: "jwk" });
-    return nodeSign("sha512", Buffer.from(base), {
-      key: privateKey,
-      padding: cryptoConstants.RSA_PKCS1_PSS_PADDING,
-      saltLength: 64
-    });
+    return {
+      algorithm: alg,
+      sign: (data) => nodeSign("sha512", Buffer.from(data), {
+        key: privateKey,
+        padding: cryptoConstants.RSA_PKCS1_PSS_PADDING,
+        saltLength: 64
+      })
+    };
+  }
+  return { algorithm: alg, sign: (data) => signWithPrivateJwkAsync(alg, jwk, Buffer.from(data)) };
+}
+async function createWebBotSignature(...args) {
+  try {
+    return await createSignature(...args);
+  } catch (error) {
+    if (isSignatureError(error)) throw new WebBotAuthError(400, "component_value");
+    throw error;
   }
-  return signWithPrivateJwkAsync(alg, jwk, Buffer.from(base));
+}
+function componentDescriptor(identifier) {
+  const bare = identifier.split(";", 1)[0];
+  const [, params] = parseItem(`"${bare}"${identifier.slice(bare.length)}`);
+  return component(bare, Object.fromEntries(params));
+}
+function coveredFields(components, headers) {
+  const names = new Set(components.filter((c) => !c.name.startsWith("@")).map((c) => c.name));
+  return [...names].flatMap((name) => {
+    const value = getHeaderValue(headers, name);
+    return value === void 0 ? [] : [{ name, value }];
+  });
 }
 async function signWebBotAuth(request, key, options) {
   const origin = canonicalAgentOrigin(options.origin);
@@ -655,6 +684,7 @@ async function signWebBotAuth(request, key, options) {
   const now = Math.floor((options.now ?? (() => Date.now() / 1e3))());
   const window = options.windowSeconds ?? 300;
   const nonce = options.nonce ?? randomBytes(64).toString("base64url");
+  if (!Number.isSafeInteger(now)) throw new TypeError("Invalid Web Bot Auth clock");
   if (!Number.isInteger(window) || window < 1 || window > 300 || !/^[A-Za-z0-9_+\/-]{22,256}={0,2}$/.test(nonce))
     throw new TypeError("Invalid Web Bot Auth lifetime or nonce");
   if (!options.relay && ["signature", "signature-input", "signature-agent"].some(
@@ -667,42 +697,69 @@ async function signWebBotAuth(request, key, options) {
   for (const [name, value] of Object.entries(request.headers))
     if (value !== void 0 && !["signature", "signature-input", "signature-agent", "content-digest"].includes(name.toLowerCase()))
       headers[name.toLowerCase()] = Array.isArray(value) ? value.join(", ") : value;
-  const components = ['"@method"', '"@target-uri"', '"@authority"'];
+  const components = [component("@method"), component("@target-uri"), component("@authority")];
   if (request.body !== void 0 && request.body !== "") {
     if (!getHeaderValue(headers, "content-type"))
       throw new TypeError("Body-bearing Web Bot Auth requests need Content-Type");
     headers["content-digest"] = computeContentDigest(request.body, "rfc8941-base64");
-    components.push('"content-type"', '"content-digest"');
+    components.push(component("content-type"), component("content-digest"));
   }
   if (options.relay && ["signature", "signature-input", "signature-agent"].some((name) => !getHeaderValue(request.headers, name)))
     throw new TypeError("Relay requires the existing signature fields");
   const earlier = options.relay ? inputs(request.headers) : [];
-  if (earlier.some((input2) => input2.label === label || input2.params.tag !== WEB_BOT_AUTH_PROFILE))
+  if (earlier.some((input) => input.label === label || input.params.tag !== WEB_BOT_AUTH_PROFILE))
     throw new TypeError("Relay requires existing Web Bot Auth signatures and a fresh label");
   const priorAgent = options.relay ? getHeaderValue(request.headers, "signature-agent") : void 0;
   if (priorAgent) dictionary(priorAgent, "Signature-Agent");
   headers["signature-agent"] = `${priorAgent ? priorAgent + ", " : ""}${label}="${origin}"`;
-  components.push(`"signature-agent";key="${label}"`);
-  for (const inner of earlier) {
-    for (const component of inner.components) {
-      const bare = component.split(";", 1)[0];
-      const encoded = `"${bare}"${component.slice(bare.length)}`;
-      if (!components.includes(encoded)) components.push(encoded);
+  if (priorAgent) dictionary(headers["signature-agent"], "Signature-Agent");
+  components.push(component("signature-agent", { key: label }));
+  const covered = new Set(components.map(componentIdentity));
+  const cover = (descriptor) => {
+    const identity = componentIdentity(descriptor);
+    if (!covered.has(identity)) {
+      covered.add(identity);
+      components.push(descriptor);
     }
-    components.push(`"signature-input";key="${inner.label}"`, `"signature";key="${inner.label}"`);
+  };
+  for (const inner of earlier) {
+    for (const identifier of inner.components) cover(componentDescriptor(identifier));
+    cover(component("signature-input", { key: inner.label }));
+    cover(component("signature", { key: inner.label }));
   }
   const priorInput = options.relay ? getHeaderValue(request.headers, "signature-input") : void 0;
   const priorSignature = options.relay ? getHeaderValue(request.headers, "signature") : void 0;
   if (options.relay && (!priorInput || !priorSignature || !priorAgent))
     throw new TypeError("Relay requires the existing signature fields");
-  headers["signature-input"] = `${priorInput ? priorInput + ", " : ""}${label}=(${components.join(" ")});created=${now};expires=${now + window};nonce="${nonce}";keyid="${jwkThumbprint(jwk)}";alg="${algorithm(jwk)}";tag="web-bot-auth"`;
-  const input = parseSignatureInput(headers["signature-input"], label);
+  if (priorInput) headers["signature-input"] = priorInput;
   if (priorSignature) headers.signature = priorSignature;
-  const bytes = await signBase(
-    buildWebBotAuthSignatureBase(input, { ...request, url: new URL(request.url).href, headers }),
-    key
+  for (const inner of earlier)
+    buildWebBotAuthSignatureBase(inner, { ...request, url: new URL(request.url).href, headers });
+  const targetUri = new URL(request.url);
+  targetUri.hash = "";
+  const signed = await createWebBotSignature(
+    {
+      kind: "request",
+      method: request.method.toUpperCase(),
+      targetUri: targetUri.href,
+      fields: coveredFields(components, headers)
+    },
+    {
+      label,
+      components,
+      parameters: {
+        created: now,
+        expires: now + window,
+        nonce,
+        keyid: jwkThumbprint(jwk),
+        alg: algorithm(jwk),
+        tag: WEB_BOT_AUTH_PROFILE
+      },
+      signer: webBotSigner(key)
+    }
   );
-  headers.signature = `${priorSignature ? priorSignature + ", " : ""}${label}=:${Buffer.from(bytes).toString("base64")}:`;
+  headers["signature-input"] = `${priorInput ? priorInput + ", " : ""}${signed.signatureInput}`;
+  headers.signature = `${priorSignature ? priorSignature + ", " : ""}${signed.signature}`;
   return headers;
 }
 async function createSignedSignatureDirectory(originUrl, signingKeys, options = {}) {
@@ -737,15 +794,29 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
   };
   const signatureInputs = [], signatures = [];
   for (let i = 0; i < keys.length; i++) {
-    const label = `key${i + 1}`;
-    const value = `${label}=("@authority";req "content-digest");created=${now - DIRECTORY_CLOCK_SKEW_SECONDS};expires=${now + lifetime};keyid="${keys[i].kid}";alg="${algorithm(keys[i])}";tag="${DIRECTORY_TAG}"`;
-    const input = parseSignatureInput(value, label);
-    const bytes = await signBase(
-      buildWebBotAuthSignatureBase(input, { method: "GET", url: response.request.url, headers: {} }, response),
-      signingKeys[i]
+    const signed = await createWebBotSignature(
+      {
+        kind: "response",
+        status: response.status,
+        fields: coveredFields([component("content-digest")], response.headers),
+        request: { kind: "request", method: "GET", targetUri: response.request.url, fields: [] }
+      },
+      {
+        label: `key${i + 1}`,
+        components: [component("@authority", { req: true }), component("content-digest")],
+        parameters: {
+          // Backdate created so verifiers whose clocks run slightly behind accept a fresh proof.
+          created: now - DIRECTORY_CLOCK_SKEW_SECONDS,
+          expires: now + lifetime,
+          keyid: keys[i].kid,
+          alg: algorithm(keys[i]),
+          tag: DIRECTORY_TAG
+        },
+        signer: webBotSigner(signingKeys[i])
+      }
     );
-    signatureInputs.push(value);
-    signatures.push(`${label}=:${Buffer.from(bytes).toString("base64")}:`);
+    signatureInputs.push(signed.signatureInput);
+    signatures.push(signed.signature);
   }
   response.headers["signature-input"] = signatureInputs.join(", ");
   response.headers.signature = signatures.join(", ");

package/dist/lib/testing/storyboard/junit.js

@@ -82,8 +82,9 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
     const suiteGroup = options.suite_groups?.[sb.storyboard_id];
     const suiteClassname = suiteGroup ? `${suiteGroup}.${sb.storyboard_id}` : sb.storyboard_id;
     const suiteCases = [];
-    let suiteFailures = sb.failed_count;
+    let suiteFailures = 0;
     let representedSkipped = 0;
+    let suiteSkipped = 0;
     const passPhases = sb.passes?.length ? sb.passes.map((pass) => ({ label: `Pass ${pass.pass_index} \u203A `, phases: pass.phases })) : [{ label: "", phases: sb.phases }];
     for (const pass of passPhases) {
       for (const phase of pass.phases) {
@@ -93,6 +94,7 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
           const time = ((step.duration_ms || 0) / 1e3).toFixed(3);
           if (step.skipped) {
             representedSkipped += 1;
+            suiteSkipped += 1;
             totalSkipped += 1;
             suiteCases.push(
               `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
@@ -102,7 +104,6 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
             continue;
           }
           if (!step.passed) {
-            totalFailures += 1;
             const failureDetails = [
               step.error,
               ...step.validations.filter((v) => !v.passed).map(
@@ -114,6 +115,17 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
               // report body.
               ...hintLines(step.hints)
             ].filter(Boolean).join("\n");
+            if (step.counts_toward_failure === false) {
+              suiteCases.push(
+                `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
+      <system-out>${xmlEscape(`Optional phase failure; excluded from storyboard verdict.
+${failureDetails}`)}</system-out>
+    </testcase>`
+              );
+              continue;
+            }
+            totalFailures += 1;
+            suiteFailures += 1;
             const message = step.error || firstHintMessage(step) || "validation failed";
             suiteCases.push(
               `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
@@ -136,6 +148,7 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
     if (hasStoryboardFixtureSkip) {
       totalTests += 1;
       totalSkipped += 1;
+      suiteSkipped += 1;
       suiteCases.push(
         `    <testcase classname="${xmlEscape(suiteClassname)}" name="Fixture resolution" time="0.000">
       <skipped message="${xmlEscape(fixtureGap.detail)}"/>
@@ -159,7 +172,7 @@ ${assertion.error}` : ""}`;
     totalDuration += sb.total_duration_ms || 0;
     const suiteTests = suiteCases.length;
     suites.push(
-      `  <testsuite name="${xmlEscape(suiteGroup ? `${suiteGroup} \u203A ${sb.storyboard_title}` : sb.storyboard_title)}"${suiteGroup ? ` package="${xmlEscape(`adcp.${suiteGroup}`)}"` : ""} tests="${suiteTests}" failures="${suiteFailures}" skipped="${sb.skipped_count}" time="${((sb.total_duration_ms || 0) / 1e3).toFixed(3)}" timestamp="${sb.tested_at || (/* @__PURE__ */ new Date()).toISOString()}">
+      `  <testsuite name="${xmlEscape(suiteGroup ? `${suiteGroup} \u203A ${sb.storyboard_title}` : sb.storyboard_title)}"${suiteGroup ? ` package="${xmlEscape(`adcp.${suiteGroup}`)}"` : ""} tests="${suiteTests}" failures="${suiteFailures}" skipped="${suiteSkipped}" time="${((sb.total_duration_ms || 0) / 1e3).toFixed(3)}" timestamp="${sb.tested_at || (/* @__PURE__ */ new Date()).toISOString()}">
 ` + suiteCases.join("\n") + `
   </testsuite>`
     );

package/dist/lib/testing/storyboard/junit.mjs

@@ -58,8 +58,9 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
     const suiteGroup = options.suite_groups?.[sb.storyboard_id];
     const suiteClassname = suiteGroup ? `${suiteGroup}.${sb.storyboard_id}` : sb.storyboard_id;
     const suiteCases = [];
-    let suiteFailures = sb.failed_count;
+    let suiteFailures = 0;
     let representedSkipped = 0;
+    let suiteSkipped = 0;
     const passPhases = sb.passes?.length ? sb.passes.map((pass) => ({ label: `Pass ${pass.pass_index} \u203A `, phases: pass.phases })) : [{ label: "", phases: sb.phases }];
     for (const pass of passPhases) {
       for (const phase of pass.phases) {
@@ -69,6 +70,7 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
           const time = ((step.duration_ms || 0) / 1e3).toFixed(3);
           if (step.skipped) {
             representedSkipped += 1;
+            suiteSkipped += 1;
             totalSkipped += 1;
             suiteCases.push(
               `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
@@ -78,7 +80,6 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
             continue;
           }
           if (!step.passed) {
-            totalFailures += 1;
             const failureDetails = [
               step.error,
               ...step.validations.filter((v) => !v.passed).map(
@@ -90,6 +91,17 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
               // report body.
               ...hintLines(step.hints)
             ].filter(Boolean).join("\n");
+            if (step.counts_toward_failure === false) {
+              suiteCases.push(
+                `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
+      <system-out>${xmlEscape(`Optional phase failure; excluded from storyboard verdict.
+${failureDetails}`)}</system-out>
+    </testcase>`
+              );
+              continue;
+            }
+            totalFailures += 1;
+            suiteFailures += 1;
             const message = step.error || firstHintMessage(step) || "validation failed";
             suiteCases.push(
               `    <testcase classname="${xmlEscape(suiteClassname)}" name="${xmlEscape(name)}" time="${time}">
@@ -112,6 +124,7 @@ function formatStoryboardResultsAsJUnit(results, options = {}) {
     if (hasStoryboardFixtureSkip) {
       totalTests += 1;
       totalSkipped += 1;
+      suiteSkipped += 1;
       suiteCases.push(
         `    <testcase classname="${xmlEscape(suiteClassname)}" name="Fixture resolution" time="0.000">
       <skipped message="${xmlEscape(fixtureGap.detail)}"/>
@@ -135,7 +148,7 @@ ${assertion.error}` : ""}`;
     totalDuration += sb.total_duration_ms || 0;
     const suiteTests = suiteCases.length;
     suites.push(
-      `  <testsuite name="${xmlEscape(suiteGroup ? `${suiteGroup} \u203A ${sb.storyboard_title}` : sb.storyboard_title)}"${suiteGroup ? ` package="${xmlEscape(`adcp.${suiteGroup}`)}"` : ""} tests="${suiteTests}" failures="${suiteFailures}" skipped="${sb.skipped_count}" time="${((sb.total_duration_ms || 0) / 1e3).toFixed(3)}" timestamp="${sb.tested_at || (/* @__PURE__ */ new Date()).toISOString()}">
+      `  <testsuite name="${xmlEscape(suiteGroup ? `${suiteGroup} \u203A ${sb.storyboard_title}` : sb.storyboard_title)}"${suiteGroup ? ` package="${xmlEscape(`adcp.${suiteGroup}`)}"` : ""} tests="${suiteTests}" failures="${suiteFailures}" skipped="${suiteSkipped}" time="${((sb.total_duration_ms || 0) / 1e3).toFixed(3)}" timestamp="${sb.tested_at || (/* @__PURE__ */ new Date()).toISOString()}">
 ` + suiteCases.join("\n") + `
   </testsuite>`
     );