@blamejs/core 0.15.12 → 0.15.14

package/lib/structured-fields.js

@@ -70,6 +70,7 @@
 // node:util is a builtin (no lib require cycle) — used for strict UTF-8
 // validation of RFC 9651 Display Strings.
 var TextDecoder = require("node:util").TextDecoder;
+var codepointClass = require("./codepoint-class");
 
 function splitTopLevel(s, sep) {
   if (typeof s !== "string") return [];
@@ -103,6 +104,261 @@ function splitTopLevel(s, sep) {
   return out;
 }
 
+/**
+ * @primitive b.structuredFields.splitUnquoted
+ * @signature b.structuredFields.splitUnquoted(s, sep)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.splitTopLevel
+ *
+ * Split `s` on every `sep` that falls OUTSIDE a `"..."` quoted run — the
+ * iCalendar / vCard variant of the quote-aware splitter. A `"` toggles the
+ * quoted state and there is NO backslash escaping of the quote (RFC 5545
+ * 3.1.1 / RFC 6350 3.3 QSAFE-CHAR excludes DQUOTE, so a `"` always opens or
+ * closes a run). This is deliberately simpler than `splitTopLevel`, which
+ * honours HTTP structured-field backslash-quote escapes; the two are NOT
+ * interchangeable. Accepts any single-character separator.
+ *
+ * @example
+ *   b.structuredFields.splitUnquoted('a;b="x;y";c', ";");
+ *   // returns ['a', 'b="x;y"', 'c']
+ */
+function splitUnquoted(s, sep) {
+  var out = [];
+  var inQ = false;
+  var start = 0;
+  for (var i = 0; i < s.length; i++) {
+    var c = s.charAt(i);
+    if (c === '"') { inQ = !inQ; continue; }
+    if (c === sep && !inQ) {
+      out.push(s.slice(start, i));
+      start = i + 1;
+    }
+  }
+  out.push(s.slice(start));
+  return out;
+}
+
+/**
+ * @primitive b.structuredFields.stripDoubleQuotes
+ * @signature b.structuredFields.stripDoubleQuotes(s)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.splitUnquoted, b.structuredFields.unquoteSfString
+ *
+ * Strip ONE layer of surrounding `"` from `s` when both ends are a double
+ * quote (length ≥ 2), otherwise return `s` unchanged. The plain DQUOTE
+ * unwrap used by the iCal / vCard parsers for a quoted parameter value —
+ * no backslash-escape processing (RFC 5545 3.1 / RFC 6350 5: a quoted
+ * param value is QSAFE-CHAR, which excludes DQUOTE, so there is nothing to
+ * unescape). Distinct from `unquoteSfString`, which decodes HTTP
+ * structured-field `\"` / `\\` escapes.
+ *
+ * @example
+ *   b.structuredFields.stripDoubleQuotes('"a;b"');
+ *   // returns 'a;b'
+ *
+ *   b.structuredFields.stripDoubleQuotes('plain');
+ *   // returns 'plain'
+ */
+function stripDoubleQuotes(s) {
+  if (s.length >= 2 && s.charAt(0) === '"' && s.charAt(s.length - 1) === '"') {
+    return s.slice(1, -1);
+  }
+  return s;
+}
+
+/**
+ * @primitive b.structuredFields.unfoldHeaderContinuations
+ * @signature b.structuredFields.unfoldHeaderContinuations(value)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.parseTagList
+ *
+ * Collapse RFC 5322 folding whitespace — a CRLF (or bare LF) followed by one
+ * or more spaces/tabs — back to a single space, reversing the line folding a
+ * header value may carry in transit. Used before parsing DKIM / ARC /
+ * Authentication-Results tag lists, where a folded `b=` / `bh=` value must be
+ * rejoined before its base64 is read.
+ *
+ * @example
+ *   b.structuredFields.unfoldHeaderContinuations("v=DKIM1;\r\n  k=rsa");
+ *   // returns "v=DKIM1; k=rsa"
+ */
+function unfoldHeaderContinuations(value) {
+  return String(value).replace(/\r?\n[ \t]+/g, " ");
+}
+
+/**
+ * @primitive b.structuredFields.parseKeyValuePiece
+ * @signature b.structuredFields.parseKeyValuePiece(piece, kvSep?, lowerKey?)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.parseTagList, b.structuredFields.splitTopLevel
+ *
+ * Parse ONE already-split list piece into a `{ key, value }` pair: `key` is the
+ * text before the first `kvSep` (default "="), trimmed and — unless `lowerKey`
+ * is `false` — lower-cased; `value` is the raw remainder (the caller trims /
+ * unquotes / sf-string-parses it per its own grammar). A piece with NO `kvSep`
+ * is a "bare" item — `value` is null — which the caller handles per its grammar
+ * (skip it, or treat as a flag-style directive).
+ *
+ * The shared per-pair step behind every `key=value` list parser: the naive
+ * `parseTagList` loop AND the quote-aware parsers that first `splitTopLevel`
+ * then parse each piece (Cache-Control directives, Client-Hints brand params,
+ * Content-Type parameters). `lowerKey:false` serves the rare grammar whose key
+ * is case-sensitive (a verbatim tag-list passthrough).
+ *
+ * @example
+ *   b.structuredFields.parseKeyValuePiece("Max-Age=60");   // → { key: "max-age", value: "60" }
+ *   b.structuredFields.parseKeyValuePiece("no-store");      // → { key: "no-store", value: null }
+ *   b.structuredFields.parseKeyValuePiece("Key=a=b", "=", false); // → { key: "Key", value: "a=b" }
+ */
+function parseKeyValuePiece(piece, kvSep, lowerKey) {
+  var sep = kvSep || "=";
+  var at = piece.indexOf(sep);
+  var rawKey = (at === -1 ? piece : piece.slice(0, at)).trim();
+  var key = lowerKey === false ? rawKey : rawKey.toLowerCase();
+  return { key: key, value: at === -1 ? null : piece.slice(at + sep.length) };
+}
+
+/**
+ * @primitive b.structuredFields.parseTagList
+ * @signature b.structuredFields.parseTagList(input, opts?)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.splitTopLevel
+ *
+ * Parse a NAIVE delimited `key<kvSep>value` tag list into an ordered
+ * array of `[key, value]` pairs. This is the non-quote-aware sibling
+ * of `splitTopLevel`: it is for grammars whose RFC forbids the DQUOTE
+ * structured-string form, so a bare `split` is correct and a
+ * quote-aware walk would be wrong — DKIM (RFC 6376 §3.2), DMARC
+ * (RFC 7489 §6.4), ARC (RFC 8617 §4), BIMI (RFC 9091 §4), and the
+ * MTA-STS policy grammar (RFC 8461, line/colon delimited).
+ *
+ * Pairs are returned (not a map) so a caller whose grammar permits a
+ * repeated key — MTA-STS `mx:` lines list one host each — keeps every
+ * occurrence; a caller wanting last-wins map semantics folds the
+ * pairs into a plain object itself. Order is preserved, so a caller
+ * that throws on a malformed value throws at the same point it would
+ * have mid-loop.
+ *
+ * Entries that are empty after trimming, or carry no `kvSep`, are
+ * skipped (matching every shipped parser's prior behavior).
+ *
+ * @opts
+ *   sep:          string|RegExp,  // entry separator. default: ";"  (MTA-STS uses /\r?\n/)
+ *   kvSep:        string,         // key/value separator. default: "="  (MTA-STS uses ":")
+ *   unfold:       boolean,        // collapse CRLF+WSP folds to a space first (DKIM FWS). default: false
+ *   stripValueWs: boolean,        // strip all whitespace inside each value (DKIM/ARC FWS). default: false
+ *   lowerKey:     boolean,        // lower-case each key. default: true (set false to preserve case)
+ *
+ * @example
+ *   b.structuredFields.parseTagList("v=DKIM1; k=rsa; p=MIGf");
+ *   // → [ ["v", "DKIM1"], ["k", "rsa"], ["p", "MIGf"] ]
+ *
+ *   b.structuredFields.parseTagList("version:STSv1\nmx:a.example\nmx:b.example",
+ *     { sep: /\r?\n/, kvSep: ":" });
+ *   // → [ ["version","STSv1"], ["mx","a.example"], ["mx","b.example"] ]
+ */
+function parseTagList(input, opts) {
+  opts = opts || {};
+  var sep = opts.sep === undefined ? ";" : opts.sep;
+  var kvSep = opts.kvSep === undefined ? "=" : opts.kvSep;
+  var s = String(input);
+  if (opts.unfold) s = unfoldHeaderContinuations(s);
+  var kvps = parseKeyValuePieces(s.split(sep), 0, kvSep, opts.lowerKey);
+  var out = [];
+  forEachKeyValue(kvps, function (key, val) {
+    if (opts.stripValueWs) val = val.replace(/\s+/g, "");
+    out.push([key, val]);
+  });
+  return out;
+}
+
+/**
+ * @primitive b.structuredFields.parseKeyValuePieces
+ * @signature b.structuredFields.parseKeyValuePieces(pieces, startIndex?, kvSep?, lowerKey?)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.parseKeyValuePiece, b.structuredFields.parseTagList
+ *
+ * Iterate an already-split list of structured-field pieces, trimming each,
+ * dropping empties, and parsing the survivors into `{ key, value }` records
+ * via `parseKeyValuePiece`. `startIndex` skips a leading non-pair token (the
+ * media type in a `Content-Type`, the brand in a `Sec-CH-UA` member); `kvSep`
+ * overrides the default `"="`; `lowerKey:false` preserves key case for a
+ * case-sensitive grammar.
+ *
+ * The split is left to the caller because the boundary discipline differs by
+ * grammar — `splitTopLevel` honours quotes/parens for RFC 8941 lists, while a
+ * plain `String(value).split(";")` is right where inner separators cannot be
+ * quoted. Per-piece dispatch (unquote, numeric coercion, poisoned-key drops)
+ * stays with the caller; this owns only the uniform iterate-trim-skip-parse
+ * spine the parsers shared verbatim.
+ *
+ * @opts
+ *   startIndex: number,   // default: 0 — first piece treated as a key/value pair
+ *   kvSep:      string,   // default: "=" — key/value separator within a piece
+ *   lowerKey:   boolean,  // default: true — lower-case each parsed key
+ *
+ * @example
+ *   var kvps = b.structuredFields.parseKeyValuePieces(
+ *     b.structuredFields.splitTopLevel("max-age=600, immutable", ","));
+ *   // → [ { key: "max-age", value: "600" }, { key: "immutable", value: null } ]
+ */
+function parseKeyValuePieces(pieces, startIndex, kvSep, lowerKey) {
+  var out = [];
+  for (var i = startIndex || 0; i < pieces.length; i += 1) {
+    var p = pieces[i].trim();
+    if (p.length === 0) continue;
+    out.push(parseKeyValuePiece(p, kvSep, lowerKey));
+  }
+  return out;
+}
+
+/**
+ * @primitive b.structuredFields.forEachKeyValue
+ * @signature b.structuredFields.forEachKeyValue(kvps, handler)
+ * @since     0.15.13
+ * @status    stable
+ * @related   b.structuredFields.parseKeyValuePieces, b.structuredFields.parseTagList
+ *
+ * Consume the `{ key, value }` records from `parseKeyValuePieces`: skip
+ * the bare entries (those with a `null` value — a key that carried no
+ * separator), trim each surviving value, and invoke
+ * `handler(key, trimmedValue, index)`. The mirror of
+ * `parseKeyValuePieces` on the consuming side — that primitive owns the
+ * parse spine, this owns the iterate-skip-bare-trim spine every header
+ * parser repeated verbatim before dispatching.
+ *
+ * Per-key dispatch (sf-string unquoting, numeric coercion, poisoned-key
+ * drops, building a typed result) stays in the handler — a handler that
+ * `return`s skips the current entry, exactly like a `continue`. Parsers
+ * that instead treat a bare key as meaningful (a value-less directive)
+ * iterate the records directly rather than calling this.
+ *
+ * @example
+ *   var b = require("blamejs");
+ *
+ *   var out = {};
+ *   var kvps = b.structuredFields.parseKeyValuePieces("a=1; b=2".split(";"));
+ *   b.structuredFields.forEachKeyValue(kvps, function (key, value) {
+ *     out[key] = value;
+ *   });
+ *   // out → { a: "1", b: "2" }
+ */
+function forEachKeyValue(kvps, handler) {
+  if (typeof handler !== "function") {
+    throw new TypeError("structuredFields.forEachKeyValue: handler must be a function");
+  }
+  for (var i = 0; i < kvps.length; i += 1) {
+    if (kvps[i].value === null) continue;
+    handler(kvps[i].key, kvps[i].value.trim(), i);
+  }
+}
+
 /**
  * @primitive b.structuredFields.refuseControlBytes
  * @signature b.structuredFields.refuseControlBytes(value, opts)
@@ -155,22 +411,18 @@ function refuseControlBytes(value, opts) {
   if (!opts.label || typeof opts.label !== "string") {
     throw new TypeError("refuseControlBytes: opts.label (non-empty string) is required");
   }
-  var allowHt = opts.allowHt !== false;
-  for (var i = 0; i < value.length; i += 1) {
-    var cc = value.charCodeAt(i);
-    if (allowHt && cc === 9) continue;                                                            // ASCII HT (folding whitespace)
-    if (cc < 32 || cc === 127) {                                                                  // C0 + DEL codepoint range
-      var msg = opts.label + ": value contains control characters (C0 / DEL)";
-      // opts.useNativeError === true → call the ErrorClass with a
-      // single-arg `message` (matches native Error / TypeError /
-      // RangeError signatures used by defensive request-shape
-      // readers). Default false → call with (code, message) which
-      // matches every framework-error class generated by `defineClass`.
-      if (opts.useNativeError === true) {
-        throw new opts.ErrorClass(msg);
-      }
-      throw new opts.ErrorClass(opts.code, msg);
+  var allowHt = opts.allowHt !== false;                                                            // ASCII HT (folding whitespace) permitted unless allowHt === false
+  if (codepointClass.firstControlCharOffset(value, { forbidTab: !allowHt }) !== -1) {              // C0 + DEL codepoint range
+    var msg = opts.label + ": value contains control characters (C0 / DEL)";
+    // opts.useNativeError === true → call the ErrorClass with a
+    // single-arg `message` (matches native Error / TypeError /
+    // RangeError signatures used by defensive request-shape
+    // readers). Default false → call with (code, message) which
+    // matches every framework-error class generated by `defineClass`.
+    if (opts.useNativeError === true) {
+      throw new opts.ErrorClass(msg);
     }
+    throw new opts.ErrorClass(opts.code, msg);
   }
 }
 
@@ -271,7 +523,7 @@ function containsControlBytes(value, opts) {
   for (var i = 0; i < value.length; i += 1) {
     var cc = value.charCodeAt(i);
     if (allowHt && cc === 9) continue;                                                            // ASCII HT (folding whitespace)
-    if (cc < 32 || cc === 127) return true;                                                       // C0 + DEL codepoint range
+    if (codepointClass.isForbiddenControlChar(cc, { forbidTab: true })) return true;                                                       // C0 + DEL codepoint range
   }
   return false;
 }
@@ -707,6 +959,13 @@ function serialize(value, type, opts) {
 
 module.exports = {
   splitTopLevel:        splitTopLevel,
+  splitUnquoted:        splitUnquoted,
+  stripDoubleQuotes:    stripDoubleQuotes,
+  parseTagList:         parseTagList,
+  unfoldHeaderContinuations: unfoldHeaderContinuations,
+  parseKeyValuePiece:   parseKeyValuePiece,
+  parseKeyValuePieces:  parseKeyValuePieces,
+  forEachKeyValue:      forEachKeyValue,
   refuseControlBytes:   refuseControlBytes,
   containsControlBytes: containsControlBytes,
   unquoteSfString:      unquoteSfString,

package/lib/template.js

@@ -93,6 +93,7 @@ var nodeFs = require("node:fs");
 var nodePath = require("node:path");
 var lazyRequire = require("./lazy-require");
 var validateOpts = require("./validate-opts");
+var markupEscape = require("./markup-escape").markupEscape;
 
 // Lazy because b.template can be loaded before b.sandbox (which pulls
 // in node:worker_threads). Operators not opting into sandboxed helpers
@@ -116,9 +117,6 @@ var DEFAULT_STRING_TEMPLATE_BYTES = require("./constants").BYTES.kib(256);
 // HTML escape (exported)
 // ============================================================
 
-var ESCAPE_MAP = { "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#x27;" };
-var ESCAPE_RE = /[&<>"']/g;
-
 /**
  * @primitive b.template.escapeHtml
  * @signature b.template.escapeHtml(value)
@@ -141,8 +139,12 @@ var ESCAPE_RE = /[&<>"']/g;
  */
 function escapeHtml(value) {
   if (value === null || value === undefined) return "";
-  var s = typeof value === "string" ? value : String(value);
-  return s.replace(ESCAPE_RE, function (c) { return ESCAPE_MAP[c]; });
+  // Delegate the actual escaping to the centralized markup escaper so the
+  // five-character HTML set (& < > " ') is defined in one place — a divergence
+  // between this and the shared escaper is an XSS / XML-injection surface. The
+  // apostrophe is escaped to its numeric form for safety in single-quoted
+  // attribute contexts (the historical behavior of this primitive).
+  return markupEscape(value, { apos: "&#x27;" });
 }
 
 // ============================================================

package/lib/tenant-quota.js

@@ -52,6 +52,7 @@
 
 var C = require("./constants");
 var lazyRequire = require("./lazy-require");
+var boundedMap = require("./bounded-map");
 var validateOpts = require("./validate-opts");
 var { defineClass } = require("./framework-error");
 
@@ -183,16 +184,7 @@ function create(opts) {
     return defaultBytesCap;
   }
 
-  function _emitAudit(action, outcome, metadata) {
-    if (!auditOn) return;
-    try {
-      audit().safeEmit({
-        action:   action,
-        outcome:  outcome,
-        metadata: metadata || {},
-      });
-    } catch (_e) { /* audit best-effort */ }
-  }
+  var _emitAudit = audit().namespaced(null, { audit: auditOn });
 
   function _emitMetric(name, n) {
     try { observability().safeEvent(name, n || 1, {}); }
@@ -363,29 +355,49 @@ function budget(opts) {
   }
   var auditOn = opts.audit !== false;
 
-  // tenantId → { windowStart, calls, rowsRead }
+  // TRUE sliding window (RFC-ish rolling counter, as advertised) — the prior
+  // first-call-pinned fixed window admitted ~2x the cap in a boundary burst.
+  // The window is split into BINS sub-bins; each observe lands in the current
+  // bin and the cap is enforced against the trailing-window SUM, so a burst
+  // straddling the reset can't double the rate. Mirrors network-byte-quota's
+  // _slideAndSum ring (here with two counters + a configurable bin width).
+  var BINS = 12;
+  var binMs = Math.max(1, Math.floor(windowMs / BINS));
+
+  // tenantId → { calls: number[BINS], rows: number[BINS], startBin }
   var counters = new Map();
 
-  function _slot(tenantId, now) {
-    var c = counters.get(tenantId);
-    if (!c || (now - c.windowStart) >= windowMs) {
-      c = { windowStart: now, calls: 0, rowsRead: 0 };
-      counters.set(tenantId, c);
+  // Advance the ring so its BINS bins cover the trailing [nowBin-BINS+1 .. nowBin],
+  // zeroing bins that scrolled out of the window. Returns the tenant's ring.
+  function _slide(tenantId, now) {
+    var nowBin = Math.floor(now / binMs);
+    // A freshly-created ring is anchored at the current bin, so the advance
+    // below evaluates to 0 (no-op) on the create path — get-or-insert and the
+    // slide stay one code path.
+    var c = boundedMap.getOrInsert(counters, tenantId, function () {
+      return { calls: new Array(BINS).fill(0), rows: new Array(BINS).fill(0), startBin: nowBin - (BINS - 1) };
+    });
+    var advance = nowBin - (c.startBin + (BINS - 1));
+    if (advance > 0) {
+      if (advance >= BINS) {
+        c.calls.fill(0); c.rows.fill(0);
+      } else {
+        for (var i = 0; i < BINS - advance; i++) { c.calls[i] = c.calls[i + advance]; c.rows[i] = c.rows[i + advance]; }
+        for (var k = BINS - advance; k < BINS; k++) { c.calls[k] = 0; c.rows[k] = 0; }
+      }
+      c.startBin = nowBin - (BINS - 1);
     }
     return c;
   }
 
-  function _emitAudit(action, outcome, metadata) {
-    if (!auditOn) return;
-    try {
-      audit().safeEmit({
-        action:   action,
-        outcome:  outcome,
-        metadata: metadata || {},
-      });
-    } catch (_e) { /* audit best-effort */ }
+  function _sum(c) {
+    var calls = 0, rows = 0;
+    for (var i = 0; i < BINS; i++) { calls += c.calls[i]; rows += c.rows[i]; }
+    return { calls: calls, rowsRead: rows };
   }
 
+  var _emitAudit = audit().namespaced(null, { audit: auditOn });
+
   function _emitMetric(name, n) {
     try { observability().safeEvent(name, n || 1, {}); }
     catch (_e) { /* drop-silent */ }
@@ -396,16 +408,19 @@ function budget(opts) {
       "tenantQuota.budget.observe: tenantId", TenantQuotaError, "tenant-quota/bad-tenant");
     info = info || {};
     var rowsRead = (typeof info.rowsRead === "number" && info.rowsRead >= 0) ? info.rowsRead : 0;
-    var now = Date.now();
-    var c = _slot(tenantId, now);
-    c.calls += 1;
-    c.rowsRead += rowsRead;
+    // info.now lets a caller / test supply a deterministic clock (idiomatic —
+    // mirrors auth verifiers' opts.now); defaults to wall-clock.
+    var now = (typeof info.now === "number") ? info.now : Date.now();
+    var c = _slide(tenantId, now);
+    c.calls[BINS - 1] += 1;
+    c.rows[BINS - 1] += rowsRead;
+    var tot = _sum(c);
     var maxCalls = Math.max(1, Math.floor(qpsCap * (windowMs / C.TIME.seconds(1))));
-    if (c.calls > maxCalls || c.rowsRead > rowsCap) {
+    if (tot.calls > maxCalls || tot.rowsRead > rowsCap) {
       _emitAudit("tenant.budget.exceeded", "denied", {
         tenantId: tenantId,
-        calls:    c.calls,
-        rowsRead: c.rowsRead,
+        calls:    tot.calls,
+        rowsRead: tot.rowsRead,
         qpsCap:   qpsCap,
         rowsCap:  rowsCap,
         windowMs: windowMs,
@@ -413,19 +428,19 @@ function budget(opts) {
       _emitMetric("tenant.budget.exceeded", 1);
       throw new TenantQuotaError("tenant-quota/budget-exceeded",
         "tenantQuota.budget: tenant '" + tenantId + "' exceeded budget " +
-        "(calls=" + c.calls + "/" + maxCalls + ", rowsRead=" + c.rowsRead +
+        "(calls=" + tot.calls + "/" + maxCalls + ", rowsRead=" + tot.rowsRead +
         "/" + rowsCap + ", windowMs=" + windowMs + ")");
     }
-    return { calls: c.calls, rowsRead: c.rowsRead, windowMs: windowMs };
+    return { calls: tot.calls, rowsRead: tot.rowsRead, windowMs: windowMs };
   }
 
   function snapshot(tenantId) {
-    var now = Date.now();
-    var c = counters.get(tenantId);
-    if (!c || (now - c.windowStart) >= windowMs) {
+    if (!counters.has(tenantId)) {
       return { tenantId: tenantId, calls: 0, rowsRead: 0, windowMs: windowMs };
     }
-    return { tenantId: tenantId, calls: c.calls, rowsRead: c.rowsRead, windowMs: windowMs };
+    var c = _slide(tenantId, Date.now());
+    var tot = _sum(c);
+    return { tenantId: tenantId, calls: tot.calls, rowsRead: tot.rowsRead, windowMs: windowMs };
   }
 
   function reset(tenantId) {

package/lib/tsa.js

@@ -53,8 +53,10 @@
 
 var nodeCrypto = require("node:crypto");
 var bCrypto = require("./crypto");
+var safeBuffer = require("./safe-buffer");
 var asn1 = require("./asn1-der");
 var cms = require("./cms-codec");
+var x509Chain = require("./x509-chain");
 var validateOpts = require("./validate-opts");
 var { defineClass } = require("./framework-error");
 
@@ -104,12 +106,12 @@ var DIGEST_OID_TO_NODE = {
   "2.16.840.1.101.3.4.2.10": "sha3-512",
 };
 
-function _bytes(x, what) {
-  if (Buffer.isBuffer(x)) return x;
-  if (x instanceof Uint8Array) return Buffer.from(x);
-  if (typeof x === "string") return Buffer.from(x, "utf8");
-  throw new TsaError("tsa/bad-bytes", "tsa: " + what + " must be Buffer / Uint8Array / string");
-}
+var _bytes = safeBuffer.makeByteCoercer({
+  errorClass:    TsaError,
+  typeCode:      "tsa/bad-bytes",
+  messagePrefix: "tsa: ",
+  messageSuffix: " must be Buffer / Uint8Array / string",
+});
 
 function _normHex(h) {
   return String(h).replace(/[^0-9a-fA-F]/g, "").replace(/^0+(?=.)/, "").toUpperCase();
@@ -538,8 +540,10 @@ function _verifyChain(signerCertDer, tokenCerts, trustAnchorsPem, at) {
   throw new TsaError("tsa/chain-loop", "tsa.verifyToken: certificate chain did not terminate");
 }
 function _issued(issuer, subject) {
-  try { return subject.checkIssued(issuer) && subject.verify(issuer.publicKey); }
-  catch (_e) { return false; }
+  // Enforces basicConstraints cA:TRUE on the issuer in addition to the
+  // checkIssued + signature linkage — a non-CA cert can never be a chain
+  // issuer (basicConstraints bypass, CVE-2002-0862 class).
+  return x509Chain.issuerValidlyIssued(issuer, subject);
 }
 function _assertValidAt(cert, atMs) {
   if (atMs < cert.validFromDate.getTime() || atMs > cert.validToDate.getTime()) {
@@ -658,15 +662,10 @@ function verifyToken(token, opts) {
       throw new TsaError("tsa/bad-trust-anchors",
         "tsa.verifyToken: trustAnchorsPem must be a non-empty PEM string or array of PEM strings");
     }
-    // A supplied opts.at must be a valid Date — an Invalid Date would
-    // make every validity-window comparison NaN (silently disabling it).
-    var at = tst.genTime;
-    if (opts.at !== undefined && opts.at !== null) {
-      if (!(opts.at instanceof Date) || !isFinite(opts.at.getTime())) {
-        throw new TsaError("tsa/bad-at", "tsa.verifyToken: opts.at must be a valid Date");
-      }
-      at = opts.at;
-    }
+    // A supplied opts.at must be a valid Date — an Invalid Date would make
+    // every validity-window comparison NaN (silently disabling it).
+    validateOpts.optionalDate(opts.at, "tsa.verifyToken: opts.at", TsaError, "tsa/bad-at");
+    var at = (opts.at !== undefined && opts.at !== null) ? opts.at : tst.genTime;
     _verifyChain(signerCertDer, sd.certificates, anchors, at);
   }