@adcp/sdk 16.0.0-beta.2 → 16.0.0-beta.4

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");
     }
@@ -237,17 +238,29 @@ function assertDigest(headers, body) {
   if (!digest || !(0, import_content_digest.contentDigestUsesEncoding)(digest, "rfc8941-base64") || !(0, import_content_digest.contentDigestMatches)(digest, body))
     denied("content_digest");
 }
-function verifyBytes(input, request, jwk, response) {
+function signatureBytes(input, request, jwk, response) {
   const alg = algorithm(jwk);
   if (input.params.alg !== void 0 && input.params.alg !== alg) denied("algorithm");
   const signature = (0, import_canonicalize2.getHeaderValue)(response?.headers ?? request.headers, "signature");
   if (signature === void 0 || signature === "") denied("headers_missing");
-  let bytes;
   try {
-    bytes = (0, import_parser.parseSignature)(signature ?? "", input.label, "rfc8941-base64").bytes;
+    return { alg, bytes: (0, import_parser.parseSignature)(signature ?? "", input.label, "rfc8941-base64").bytes };
   } catch {
     return bad("signature");
   }
+}
+async function verifyBytesAsync(input, request, jwk) {
+  const { alg, bytes } = signatureBytes(input, request, jwk);
+  let valid = false;
+  try {
+    valid = await (0, import_crypto2.verifySignatureAsync)(alg, jwk, Buffer.from(buildWebBotAuthSignatureBase(input, request)), bytes);
+  } catch (error) {
+    if (error instanceof WebBotAuthError) throw error;
+  }
+  if (!valid) denied("signature_invalid");
+}
+function verifyBytes(input, request, jwk, response) {
+  const { alg, bytes } = signatureBytes(input, request, jwk, response);
   let valid = false;
   try {
     valid = (0, import_crypto2.verifySignature)(
@@ -386,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");
@@ -419,7 +432,7 @@ async function verifyWebBotAuth(request, options) {
         denied("directory_key");
       const key = checkedDirectory.keys.find((key2) => key2.kid === keyid);
       if (!key || jwkThumbprint(key) !== keyid) denied("key");
-      verifyBytes(input, request, key);
+      await verifyBytesAsync(input, request, key);
       if (options.isRevoked) await legacyRevocationCheck(options, origin, keyid);
       const nonceTuple = JSON.stringify([origin, nonce]);
       if (nonces.has(nonceTuple)) throw new WebBotAuthError(options.replayStatus ?? 429, "nonce_replayed");
@@ -655,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)))
@@ -663,16 +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))) };
   }
-  const privateKey = (0, import_crypto.createPrivateKey)({ key: jwk, format: "jwk" });
-  if (alg === "rsa-pss-sha512")
-    return (0, import_crypto.sign)("sha512", Buffer.from(base), {
-      key: privateKey,
-      padding: import_crypto.constants.RSA_PKCS1_PSS_PADDING,
-      saltLength: 64
-    });
-  return alg === "ed25519" ? (0, import_crypto.sign)(null, Buffer.from(base), privateKey) : (0, import_crypto.sign)("sha256", Buffer.from(base), { key: privateKey, dsaEncoding: "ieee-p1363" });
+  if (alg === "rsa-pss-sha512") {
+    const privateKey = (0, import_crypto.createPrivateKey)({ key: jwk, format: "jwk" });
+    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 { 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);
@@ -682,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(
@@ -694,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 = {}) {
@@ -764,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";
@@ -14,7 +20,7 @@ import { canonicalAgentUrl } from "./agent-resolver/select-agent.mjs";
 import { parseStrictJson } from "./agent-resolver/strict-json.mjs";
 import { getHeaderValue } from "./canonicalize.mjs";
 import { computeContentDigest, contentDigestMatches, contentDigestUsesEncoding } from "./content-digest.mjs";
-import { jwkToPublicKey, verifySignature } from "./crypto.mjs";
+import { jwkToPublicKey, signWithPrivateJwkAsync, verifySignature, verifySignatureAsync } from "./crypto.mjs";
 import {
   parseSignature,
   parseSignatureInput,
@@ -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");
     }
@@ -197,17 +203,29 @@ function assertDigest(headers, body) {
   if (!digest || !contentDigestUsesEncoding(digest, "rfc8941-base64") || !contentDigestMatches(digest, body))
     denied("content_digest");
 }
-function verifyBytes(input, request, jwk, response) {
+function signatureBytes(input, request, jwk, response) {
   const alg = algorithm(jwk);
   if (input.params.alg !== void 0 && input.params.alg !== alg) denied("algorithm");
   const signature = getHeaderValue(response?.headers ?? request.headers, "signature");
   if (signature === void 0 || signature === "") denied("headers_missing");
-  let bytes;
   try {
-    bytes = parseSignature(signature ?? "", input.label, "rfc8941-base64").bytes;
+    return { alg, bytes: parseSignature(signature ?? "", input.label, "rfc8941-base64").bytes };
   } catch {
     return bad("signature");
   }
+}
+async function verifyBytesAsync(input, request, jwk) {
+  const { alg, bytes } = signatureBytes(input, request, jwk);
+  let valid = false;
+  try {
+    valid = await verifySignatureAsync(alg, jwk, Buffer.from(buildWebBotAuthSignatureBase(input, request)), bytes);
+  } catch (error) {
+    if (error instanceof WebBotAuthError) throw error;
+  }
+  if (!valid) denied("signature_invalid");
+}
+function verifyBytes(input, request, jwk, response) {
+  const { alg, bytes } = signatureBytes(input, request, jwk, response);
   let valid = false;
   try {
     valid = verifySignature(
@@ -346,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");
@@ -379,7 +397,7 @@ async function verifyWebBotAuth(request, options) {
         denied("directory_key");
       const key = checkedDirectory.keys.find((key2) => key2.kid === keyid);
       if (!key || jwkThumbprint(key) !== keyid) denied("key");
-      verifyBytes(input, request, key);
+      await verifyBytesAsync(input, request, key);
       if (options.isRevoked) await legacyRevocationCheck(options, origin, keyid);
       const nonceTuple = JSON.stringify([origin, nonce]);
       if (nonces.has(nonceTuple)) throw new WebBotAuthError(options.replayStatus ?? 429, "nonce_replayed");
@@ -615,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)))
@@ -623,16 +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))) };
   }
-  const privateKey = createPrivateKey({ key: jwk, format: "jwk" });
-  if (alg === "rsa-pss-sha512")
-    return nodeSign("sha512", Buffer.from(base), {
-      key: privateKey,
-      padding: cryptoConstants.RSA_PKCS1_PSS_PADDING,
-      saltLength: 64
-    });
-  return alg === "ed25519" ? nodeSign(null, Buffer.from(base), privateKey) : nodeSign("sha256", Buffer.from(base), { key: privateKey, dsaEncoding: "ieee-p1363" });
+  if (alg === "rsa-pss-sha512") {
+    const privateKey = createPrivateKey({ key: jwk, format: "jwk" });
+    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;
+  }
+}
+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);
@@ -642,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(
@@ -654,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 = {}) {
@@ -724,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/signing/webhook-verifier.js

@@ -172,8 +172,8 @@ async function verifyWebhookSignature(request, options) {
     parsedInput.signatureParamsValue,
     "3.2"
   );
-  const publicKey = (0, import_crypto.jwkToPublicKey)(jwk);
-  const valid = (0, import_crypto.verifySignature)(parsedInput.params.alg, publicKey, Buffer.from(base, "utf8"), parsedSig.bytes);
+  (0, import_crypto.jwkToPublicKey)(jwk);
+  const valid = await (0, import_crypto.verifySignatureAsync)(parsedInput.params.alg, jwk, Buffer.from(base, "utf8"), parsedSig.bytes);
   if (!valid) {
     throw new import_errors.WebhookSignatureError(
       "webhook_signature_invalid",

package/dist/lib/signing/webhook-verifier.mjs

@@ -4,7 +4,7 @@ import { RequestSignatureError, WebhookSignatureError } from "./errors.mjs";
 import { AgentResolverError } from "./agent-resolver/errors.mjs";
 import { BrandJsonResolverError } from "./brand-jwks.mjs";
 import { parseSignature, parseSignatureInput } from "./parser.mjs";
-import { jwkToPublicKey, verifySignature } from "./crypto.mjs";
+import { jwkToPublicKey, verifySignatureAsync } from "./crypto.mjs";
 import { assertPublisherPins } from "./publisher-pins.mjs";
 import { InMemoryReplayStore } from "./replay.mjs";
 import { InMemoryRevocationStore } from "./revocation.mjs";
@@ -145,8 +145,8 @@ async function verifyWebhookSignature(request, options) {
     parsedInput.signatureParamsValue,
     "3.2"
   );
-  const publicKey = jwkToPublicKey(jwk);
-  const valid = verifySignature(parsedInput.params.alg, publicKey, Buffer.from(base, "utf8"), parsedSig.bytes);
+  jwkToPublicKey(jwk);
+  const valid = await verifySignatureAsync(parsedInput.params.alg, jwk, Buffer.from(base, "utf8"), parsedSig.bytes);
   if (!valid) {
     throw new WebhookSignatureError(
       "webhook_signature_invalid",

package/dist/lib/substitution/compile.js

@@ -22,6 +22,7 @@ __export(compile_exports, {
 });
 module.exports = __toCommonJS(compile_exports);
 var import_enums = require('../types/enums.generated.js');
+var import_consent_macros = require('./consent-macros.js');
 const BUILT_IN_SOURCE_SYNTAXES = /* @__PURE__ */ new Set([
   "adcp",
   "double_brace",
@@ -61,7 +62,7 @@ function universalMacroName(token) {
 }
 function isUniversalMacro(token) {
   const name = universalMacroName(token);
-  return name !== null && UNIVERSAL_MACRO_NAMES.has(name);
+  return name !== null && (UNIVERSAL_MACRO_NAMES.has(name) || (0, import_consent_macros.isConsentMacro)(token));
 }
 function syntaxForExactToken(token, builtIns, customSyntaxes) {
   for (const syntax of customSyntaxes) {

package/dist/lib/substitution/compile.mjs

@@ -1,4 +1,5 @@
 import { UniversalMacroValues } from "../types/enums.generated.mjs";
+import { isConsentMacro } from "./consent-macros.mjs";
 const BUILT_IN_SOURCE_SYNTAXES = /* @__PURE__ */ new Set([
   "adcp",
   "double_brace",
@@ -38,7 +39,7 @@ function universalMacroName(token) {
 }
 function isUniversalMacro(token) {
   const name = universalMacroName(token);
-  return name !== null && UNIVERSAL_MACRO_NAMES.has(name);
+  return name !== null && (UNIVERSAL_MACRO_NAMES.has(name) || isConsentMacro(token));
 }
 function syntaxForExactToken(token, builtIns, customSyntaxes) {
   for (const syntax of customSyntaxes) {

package/dist/lib/substitution/consent-macros.d.mts

@@ -0,0 +1,4 @@
+/** The complete token retains the receiving vendor's positive decimal GVL ID. */
+export declare function isVendorScopedConsentMacro(token: string): boolean;
+/** Recognize privacy signals for helper compilation and consent diagnostics. */
+export declare function isConsentMacro(token: string): boolean;

package/dist/lib/substitution/consent-macros.d.ts

@@ -0,0 +1,4 @@
+/** The complete token retains the receiving vendor's positive decimal GVL ID. */
+export declare function isVendorScopedConsentMacro(token: string): boolean;
+/** Recognize privacy signals for helper compilation and consent diagnostics. */
+export declare function isConsentMacro(token: string): boolean;