@blamejs/pki 0.6.40 → 0.6.41

package/lib/crl-sign.js

@@ -58,28 +58,28 @@ var CRL_REASON = constants.NAMES.CRL_REASON;
 var REASON_BY_NAME = intrinsic.create(null);
 Object.keys(CRL_REASON).forEach(function (v) { REASON_BY_NAME[CRL_REASON[v]] = Number(v); });
 
-var KNOWN_CRL_EXT_KEYS = { authorityKeyIdentifier: 1, issuingDistributionPoint: 1, deltaCRLIndicator: 1, freshestCRL: 1, authorityInfoAccess: 1 };
-var KNOWN_SPEC_KEYS = {
+var KNOWN_CRL_EXT_KEYS = intrinsic.assign(intrinsic.create(null), { authorityKeyIdentifier: 1, issuingDistributionPoint: 1, deltaCRLIndicator: 1, freshestCRL: 1, authorityInfoAccess: 1 });
+var KNOWN_SPEC_KEYS = intrinsic.assign(intrinsic.create(null), {
   issuer: 1, thisUpdate: 1, nextUpdate: 1, revoked: 1, crlNumber: 1, extensions: 1,
-};
-var KNOWN_SPEC_KEYS_ISSUER_NAMED = {
+});
+var KNOWN_SPEC_KEYS_ISSUER_NAMED = intrinsic.assign(intrinsic.create(null), {
   thisUpdate: 1, nextUpdate: 1, revoked: 1, crlNumber: 1, extensions: 1,
-};
-var KNOWN_ISSUER_CERT_KEYS = { key: 1, cert: 1 };
-var KNOWN_ISSUER_EXPLICIT_KEYS = { key: 1, name: 1, publicKey: 1 };
-var KNOWN_SIGN_OPTS = { digestAlgorithm: 1, pem: 1, pss: 1 };
+});
+var KNOWN_ISSUER_CERT_KEYS = intrinsic.assign(intrinsic.create(null), { key: 1, cert: 1 });
+var KNOWN_ISSUER_EXPLICIT_KEYS = intrinsic.assign(intrinsic.create(null), { key: 1, name: 1, publicKey: 1 });
+var KNOWN_SIGN_OPTS = intrinsic.assign(intrinsic.create(null), { digestAlgorithm: 1, pem: 1, pss: 1 });
 
-var KNOWN_IDP_KEYS = { fullName: 1, onlyContainsUserCerts: 1, onlyContainsCACerts: 1, onlyContainsAttributeCerts: 1, indirectCRL: 1 };
+var KNOWN_IDP_KEYS = intrinsic.assign(intrinsic.create(null), { fullName: 1, onlyContainsUserCerts: 1, onlyContainsCACerts: 1, onlyContainsAttributeCerts: 1, indirectCRL: 1 });
 
-var KNOWN_REVOKED_KEYS = {
+var KNOWN_REVOKED_KEYS = intrinsic.assign(intrinsic.create(null), {
   serialNumber: 1, revocationDate: 1, reason: 1, invalidityDate: 1, certificateIssuer: 1, extensions: 1,
-};
+});
 
-var REQUIRED_CRITICALITY = {};
+var REQUIRED_CRITICALITY = intrinsic.create(null);
 [["cRLNumber", false], ["authorityKeyIdentifier", false], ["freshestCRL", false], ["authorityInfoAccess", false],
   ["issuingDistributionPoint", true], ["deltaCRLIndicator", true]].forEach(function (r) { REQUIRED_CRITICALITY[O(r[0])] = r[1]; });
 
-var REQUIRED_ENTRY_CRITICALITY = {};
+var REQUIRED_ENTRY_CRITICALITY = intrinsic.create(null);
 [["reasonCode", false], ["invalidityDate", false]].forEach(function (r) { REQUIRED_ENTRY_CRITICALITY[O(r[0])] = r[1]; });
 
 var _CERT_ISSUER_DEFERRED = "certificateIssuer (indirect CRLs) is not yet supported -- pki.path.crlChecker skips a CRL carrying any critical entry extension other than reasonCode, so an indirect CRL would never be authoritative for revocation. Re-enabled once the checker processes certificateIssuer / indirect CRLs.";
@@ -189,7 +189,7 @@ function _aiaValue(spec) {
 }
 
 function _buildCrlExtensions(spec, ctx) {
-  var out = [], seen = {}, isDelta = false;
+  var out = [], seen = intrinsic.create(null), isDelta = false;
   function push(oidName, critical, valueDer) {
     var id = O(oidName);
     if (seen[id]) throw _err("crl/bad-input", "duplicate CRL extension " + oidName + " (RFC 5280 sec. 5.2 -- at most one instance)");
@@ -255,7 +255,7 @@ function _buildCrlExtensions(spec, ctx) {
 
 function _buildRevoked(entryList, isDelta) {
   if (!Array.isArray(entryList)) throw _err("crl/bad-input", "revoked must be an array of revoked-certificate entries");
-  var anyExt = false, seenSerials = {};
+  var anyExt = false, seenSerials = intrinsic.create(null);
   var entries = _b.reqDenseArray(entryList, "revoked").map(function (e, idx) {
     if (!e || typeof e !== "object" || Buffer.isBuffer(e)) throw _err("crl/bad-input", "each revoked entry must be an object");
     guard.identifier.assertKnownKeys(e, KNOWN_REVOKED_KEYS, _err, "crl/bad-input", function (k) {
@@ -268,7 +268,7 @@ function _buildRevoked(entryList, isDelta) {
     if (seenSerials[serialKey]) throw _err("crl/bad-input", "revoked entry [" + idx + "] duplicates a serial number already listed in this CRL (RFC 5280 sec. 5.1.2.6)");
     seenSerials[serialKey] = true;
     var children = [serialTlv, _timeDer(e.revocationDate, "revocationDate")];
-    var entryExts = [], seen = {};
+    var entryExts = [], seen = intrinsic.create(null);
     function pushE(oidName, critical, valueDer) {
       var id = O(oidName);
       if (seen[id]) throw _err("crl/bad-input", "duplicate entry extension " + oidName + " in revoked entry [" + idx + "]");
@@ -602,7 +602,7 @@ function _serialHexOf(serial) {
  *     { cert: signerCertDer, key: signerKeyPkcs8 });
  *   pki.crl.isRevoked(crlDer, 0x1234n) ? "revoked" : "not listed";
  */
-var KNOWN_IS_REVOKED_KEYS = { time: 1, historicalMode: 1 };
+var KNOWN_IS_REVOKED_KEYS = intrinsic.assign(intrinsic.create(null), { time: 1, historicalMode: 1 });
 function isRevoked(crl, serialNumber, opts) {
   var o = guard.identifier.optionsObject(opts, _err, "crl/bad-input", "pki.crl.isRevoked options");
   guard.identifier.assertKnownKeys(o, KNOWN_IS_REVOKED_KEYS, _err, "crl/bad-input", function (k) {

package/lib/crmf-sign.js

@@ -47,8 +47,8 @@ var _b = pkiBuild.makeBuilder({
   NAME_SCHEMA: pkix.name(NS), SPKI_SCHEMA: pkix.spki(NS), EXT_DECODERS: EXT_DECODERS,
 });
 
-var KNOWN_SPEC_KEYS = { certReqId: 1, certTemplate: 1, controls: 1, regInfo: 1, pop: 1 };
-var POP_KEYS_BY_ARM = {
+var KNOWN_SPEC_KEYS = intrinsic.assign(intrinsic.create(null), { certReqId: 1, certTemplate: 1, controls: 1, regInfo: 1, pop: 1 });
+var POP_KEYS_BY_ARM = intrinsic.assign(intrinsic.create(null), {
   raVerified: { type: 1, raVerified: 1 },
   signature: { type: 1, sender: 1 },
   subsequentMessage: { type: 1, method: 1, subsequentMessage: 1 },
@@ -59,14 +59,14 @@ var POP_KEYS_BY_ARM = {
   agreeMAC: { type: 1, method: 1 },
   thisMessage: { type: 1, method: 1 },
   dhMAC: { type: 1, method: 1 },
-};
-var KNOWN_BATCH_KEYS = { messages: 1 };
-var KNOWN_TEMPLATE_KEYS = { version: 1, subject: 1, publicKey: 1, validity: 1, extensions: 1, issuer: 1 };
-var REVOCATION_TEMPLATE_KEYS = { version: 1, subject: 1, publicKey: 1, validity: 1, extensions: 1, issuer: 1, serialNumber: 1 };
+});
+var KNOWN_BATCH_KEYS = intrinsic.assign(intrinsic.create(null), { messages: 1 });
+var KNOWN_TEMPLATE_KEYS = intrinsic.assign(intrinsic.create(null), { version: 1, subject: 1, publicKey: 1, validity: 1, extensions: 1, issuer: 1 });
+var REVOCATION_TEMPLATE_KEYS = intrinsic.assign(intrinsic.create(null), { version: 1, subject: 1, publicKey: 1, validity: 1, extensions: 1, issuer: 1, serialNumber: 1 });
 function _ctlUtf8(v) { return b.utf8(String(v)); }
 function _ctlSpki(v) { var k = _b.reqDer(v, "protocolEncrKey (an SPKI DER)"); _b.assertValidSpki(k, "protocolEncrKey"); return b.raw(k); }
-var CONTROL_VALUE = { regToken: _ctlUtf8, authenticator: _ctlUtf8, oldCertID: function (v) { return _encodeCertId(v); }, protocolEncrKey: _ctlSpki };
-var REGINFO_VALUE = { utf8Pairs: _ctlUtf8 };
+var CONTROL_VALUE = intrinsic.assign(intrinsic.create(null), { regToken: _ctlUtf8, authenticator: _ctlUtf8, oldCertID: function (v) { return _encodeCertId(v); }, protocolEncrKey: _ctlSpki });
+var REGINFO_VALUE = intrinsic.assign(intrinsic.create(null), { utf8Pairs: _ctlUtf8 });
 
 
 function _encodeOptionalValidity(validity) {
@@ -106,7 +106,7 @@ function _encodeCertTemplate(tpl, opts) {
 function _buildAttrTypeAndValues(spec, code, label, valueMap) {
   if (Array.isArray(spec)) {
     if (!spec.length) throw _err(code, label + " must carry at least one entry");
-    var seenA = {};
+    var seenA = intrinsic.create(null);
     return b.sequence(pkiBuild.reqDenseArray(spec, label, _err, code).map(function (e, i) {
       var der = _b.reqDer(e, label + " [" + i + "]");
       var n;
@@ -120,7 +120,7 @@ function _buildAttrTypeAndValues(spec, code, label, valueMap) {
     }));
   }
   if (!spec || typeof spec !== "object") throw _err("crmf/bad-input", label + " must be an object or an array of pre-encoded AttributeTypeAndValue DER");
-  var out = [], seen = {};
+  var out = [], seen = intrinsic.create(null);
   guard.identifier.assertKnownKeys(spec, valueMap, _err, "crmf/bad-input", function (k) {
     return "unknown " + label + " " + JSON.stringify(k) + "; pass a pre-encoded AttributeTypeAndValue DER via the array form for a " + label + " entry outside " + Object.keys(valueMap).join("/");
   });
@@ -147,7 +147,7 @@ function _encodeCertId(id) {
 }
 
 var POPO_PRIVKEY_TAGS = intrinsic.assign(intrinsic.create(null), { keyEncipherment: 2, keyAgreement: 3 });
-var SUBSEQUENT_MESSAGE = { encrCert: 0n, challengeResp: 1n };
+var SUBSEQUENT_MESSAGE = intrinsic.assign(intrinsic.create(null), { encrCert: 0n, challengeResp: 1n });
 var DEPRECATED_POPO_METHOD = intrinsic.assign(intrinsic.create(null), { thisMessage: "encryptedKey", dhMAC: "agreeMAC" });
 
 function _encKeyWithID(privateKeyDer, identifier) {

package/lib/csr-sign.js

@@ -29,7 +29,7 @@ require("./path-validate");
 var csrVerify = require("./csr-verify");
 
 var CsrError = frameworkError.CsrError;
-var KNOWN_SPEC_KEYS = { subject: 1, subjectPublicKey: 1, extensionRequest: 1, challengePassword: 1, attributes: 1 };
+var KNOWN_SPEC_KEYS = Object.assign(Object.create(null), { subject: 1, subjectPublicKey: 1, extensionRequest: 1, challengePassword: 1, attributes: 1 });
 var b = asn1.build;
 function _err(code, message, cause) { return new CsrError(code, message, cause); }
 function _signE(kind, message, cause) { return new CsrError("csr/" + kind, message, cause); }
@@ -106,7 +106,7 @@ function _sign(spec, key, opts) {
   _b.assertValidSpki(subjectSpki, "spec.subjectPublicKey");
   var subjectDer = _b.encodeName(spec.subject == null ? [] : spec.subject);
 
-  var attrs = [], seenAttr = {};
+  var attrs = [], seenAttr = Object.create(null);
   function addAttr(attrType, valueTlv) {
     if (seenAttr[attrType]) throw _err("csr/bad-input", "duplicate " + (oid.name(attrType) || attrType) + " attribute");
     seenAttr[attrType] = true;

package/lib/ct.js

@@ -64,10 +64,10 @@ var C = constants;
 
 function _ctErr(c, m, cause) { return new CtError(c, m, cause); }
 
-var HASH_ALGORITHMS = {
+var HASH_ALGORITHMS = intrinsic.assign(intrinsic.create(null), {
   0: "none", 1: "md5", 2: "sha1", 3: "sha224", 4: "sha256", 5: "sha384", 6: "sha512",
-};
-var SIGNATURE_ALGORITHMS = { 0: "anonymous", 1: "rsa", 2: "dsa", 3: "ecdsa" };
+});
+var SIGNATURE_ALGORITHMS = intrinsic.assign(intrinsic.create(null), { 0: "anonymous", 1: "rsa", 2: "dsa", 3: "ecdsa" });
 
 var SCT_MIN_BODY = 47;
 var LOGID_BYTES = 32;
@@ -290,8 +290,8 @@ function reconstructSignedData(entry, sct) {
   return Buffer.concat(parts);
 }
 
-var CT_HASH = { sha256: "SHA-256" };
-var CT_EC_CURVE = {};
+var CT_HASH = intrinsic.assign(intrinsic.create(null), { sha256: "SHA-256" });
+var CT_EC_CURVE = intrinsic.create(null);
 CT_EC_CURVE[oid.byName("prime256v1")] = { curve: "P-256", coordLen: 32 };
 
 function _spkiAlg(spki) {
@@ -563,7 +563,7 @@ async function signSct(entry, logKey, opts) {
 }
 
 
-var LOG_STATE_TRUST = { pending: "no", qualified: "yes", usable: "yes", readonly: "yes", retired: "conditional", rejected: "no" };
+var LOG_STATE_TRUST = intrinsic.assign(intrinsic.create(null), { pending: "no", qualified: "yes", usable: "yes", readonly: "yes", retired: "conditional", rejected: "no" });
 
 function _parseLogState(state) {
   if (state == null || typeof state !== "object") throw _ctErr("ct/bad-state", "a CT log entry is missing its state");
@@ -776,7 +776,7 @@ async function verifySctWithLogList(entry, sct, logList, opts) {
   });
 }
 
-var _VERIFY_SCT_LIST_OPTS = { minScts: 1, minOperators: 1, certNotAfter: 1, at: 1 };
+var _VERIFY_SCT_LIST_OPTS = intrinsic.assign(intrinsic.create(null), { minScts: 1, minOperators: 1, certNotAfter: 1, at: 1 });
 
 function _policyCount(v, name) {
   if (v == null) return null;
@@ -1029,7 +1029,7 @@ async function verifyLogListSignature(json, signature, publicKey) {
 
 var DEFAULT_FETCH_TIMEOUT = C.TIME.seconds(30);
 var MAX_FETCH_TIMEOUT = C.TIME.seconds(600);
-var KNOWN_FETCH_OPTS = { url: 1, signerKey: 1, sigUrl: 1, transport: 1, tls: 1, headers: 1, timeout: 1, maxResponseBytes: 1, requireJsonContentType: 1 };
+var KNOWN_FETCH_OPTS = intrinsic.assign(intrinsic.create(null), { url: 1, signerKey: 1, sigUrl: 1, transport: 1, tls: 1, headers: 1, timeout: 1, maxResponseBytes: 1, requireJsonContentType: 1 });
 
 function _tlsForFetch(opts) {
   var t = opts.tls || {};
@@ -1038,6 +1038,12 @@ function _tlsForFetch(opts) {
 
 function _sameOrigin(a, b) { return new URL(a).origin === new URL(b).origin; }
 
+/** @internal Refused at the door and again where the value is used. */
+function _assertTransport(opts) {
+  return guard.identifier.assertCallableOption(opts, "transport", _ctErr, "ct/bad-input", "opts.transport",
+    "(request) => Promise<{ status, headers, body }>");
+}
+
 function _fetchCtypeToken(headers) { return String((headers || {})["content-type"] || "").split(";")[0].trim().toLowerCase(); }
 
 function _parseHttpsUrl(u, label) {
@@ -1060,7 +1066,7 @@ function _fetchBody(transport, url, req, label) {
     return transport({ method: "GET", url: url, headers: req.headers, tls: req.tls, timeout: req.timeout, maxResponseBytes: req.maxResponseBytes });
   }).then(function (res) {
     res = res || {};
-    var h = {};
+    var h = intrinsic.create(null);
     Object.keys(res.headers || {}).forEach(function (k) { h[k.toLowerCase()] = res.headers[k]; });
     var body = guard.bytes.isByteSource(res.body)
       ? guard.bytes.source(res.body, CtError, "ct/bad-input", label)
@@ -1116,13 +1122,15 @@ function _fetchBody(transport, url, req, label) {
 async function fetchLogList(opts) {
   opts = opts || {};
   guard.identifier.assertKnownKeys(opts, KNOWN_FETCH_OPTS, _ctErr, "ct/bad-input", "unknown opts field ");
+  /** @internal Read once, at the door, and carried from here. Asking again would let an option that
+   * answers differently on each read hand back something other than the value that was checked. */
+  var transport = _assertTransport(opts);
   if (opts.signerKey == null) throw _ctErr("ct/bad-input", "opts.signerKey is required -- the caller-pinned CT log-list distributor SPKI (there is no baked-in key)");
   if (opts.url == null) throw _ctErr("ct/bad-input", "opts.url is required -- the log_list.json URL (there is no baked-in vendor URL)");
   var jsonParsed = _parseHttpsUrl(opts.url, "URL");
   var jsonUrl = jsonParsed.href;
   var sigUrl = opts.sigUrl != null ? _parseHttpsUrl(opts.sigUrl, "signature URL").href : _sigUrlFor(jsonParsed);
   if (!_sameOrigin(jsonUrl, sigUrl)) throw _ctErr("ct/bad-input", "opts.sigUrl must share the log-list URL's origin (" + jsonParsed.origin + "); a cross-origin detached-signature host is not supported");
-  var transport = opts.transport;
   if (!transport) {
     var t = opts.tls || {};
     var hasAnchors = t.anchors !== undefined && t.anchors !== null && !(Array.isArray(t.anchors) && t.anchors.length === 0);
@@ -1131,7 +1139,7 @@ async function fetchLogList(opts) {
   }
   var timeout = guard.limits.cap(opts.timeout, "timeout", DEFAULT_FETCH_TIMEOUT, { E: _ctErr, code: "ct/bad-input", min: 1, max: MAX_FETCH_TIMEOUT });
   var maxResponseBytes = guard.limits.cap(opts.maxResponseBytes, "maxResponseBytes", C.LIMITS.CT_LOG_LIST_MAX_BYTES, { E: _ctErr, code: "ct/bad-input", min: 1, max: C.LIMITS.CT_LOG_LIST_MAX_BYTES });
-  var headers = {};
+  var headers = intrinsic.create(null);
   Object.keys(opts.headers || {}).forEach(function (k) {
     var lk = k.toLowerCase();
     if (lk !== "content-length" && lk !== "transfer-encoding") headers[k] = opts.headers[k];

package/lib/edwards-point.js

@@ -11,10 +11,10 @@ var SQRTM1 = _pow(2n, (P25519 - 1n) / 4n, P25519);
 var P448 = (1n << 448n) - (1n << 224n) - 1n;
 var D448 = P448 - 39081n;
 
-var CURVE = {
+var CURVE = Object.assign(Object.create(null), {
   6: { p: P25519, d: D25519, a: P25519 - 1n, len: 32, signBit: 255n },
   7: { p: P448, d: D448, a: 1n, len: 57, signBit: 455n },
-};
+});
 
 function _mul(x, y, p) { return (x % p) * (y % p) % p; }
 function _pow(b, e, p) { var r = 1n; b %= p; while (e > 0n) { if (e & 1n) r = r * b % p; b = b * b % p; e >>= 1n; } return r; }

package/lib/est.js

@@ -98,12 +98,12 @@ var OID_TEMPLATE = oid.byName("certificationRequestInfoTemplate");
 
 var OPERATIONS = ["cacerts", "simpleenroll", "simplereenroll", "fullcmc", "serverkeygen", "csrattrs"];
 
-var CLIENT_OPTS = {
+var CLIENT_OPTS = intrinsic.assign(intrinsic.create(null), {
   transport: 1, tls: 1, label: 1, timeout: 1, maxResponseBytes: 1, maxRedirects: 1, now: 1,
   auth: 1, username: 1, password: 1, allowCrossOriginRedirect: 1, proxy: 1,
-};
+});
 function _withClient(extra) {
-  var out = {};
+  var out = intrinsic.create(null);
   Object.keys(CLIENT_OPTS).forEach(function (k) { out[k] = 1; });
   Object.keys(extra || {}).forEach(function (k) { out[k] = 1; });
   return out;
@@ -119,18 +119,34 @@ var FULLCMC_OPTS = _withClient({
   transactionId: 1, senderNonce: 1, dataReturn: 1,
   responderCerts: 1, responseRecipient: 1, allowUnverifiedResponse: 1, allowUnboundResponse: 1,
 });
-var CLASSIFY_OPTS = { op: 1, now: 1 };
-var PATHS_OPTS = { label: 1 };
-var PARSE_SERVERKEYGEN_OPTS = {
+var CLASSIFY_OPTS = intrinsic.assign(intrinsic.create(null), { op: 1, now: 1 });
+var PATHS_OPTS = intrinsic.assign(intrinsic.create(null), { label: 1 });
+var PARSE_SERVERKEYGEN_OPTS = intrinsic.assign(intrinsic.create(null), {
   requestedEncryption: 1, expectedRecipientKeyId: 1, expectedRecipientKind: 1,
   expectedRecipientIssuerSerial: 1,
-};
+});
+
+var TRANSPORT_SHAPE = "(request) => Promise<{ status, headers, body }>";
 
+/** @internal Refused at the door, before any payload work, and again where the value is used. The
+ * checked value is RETURNED and it is that one the caller uses: reading the option again would ask
+ * a second time, and an accessor can answer differently on each read, so a value that passed here
+ * need not be the value that gets called. */
+function _assertTransport(opts) {
+  return guard.identifier.assertCallableOption(opts, "transport", E, "est/bad-input", "opts.transport", TRANSPORT_SHAPE);
+}
+
+/** @internal Settled first, as the sibling clients do: an options object whose reads change what it
+ * carries is refused here rather than answering one way to the check and another to the use, which
+ * is how a transport that passed could be replaced before it is called. */
 function _knownOpts(opts, known, verb) {
-  guard.identifier.assertKnownKeys(opts, known, E, "est/bad-input", function (k) {
+  var settled = guard.identifier.optionsObject(opts, E, "est/bad-input", "pki.est." + verb + " options");
+  guard.identifier.assertKnownKeys(settled, known, E, "est/bad-input", function (k) {
     return "unknown option " + JSON.stringify(k) + " for pki.est." + verb + " -- accepted: " +
       Object.keys(known).sort().join(", ");
   });
+  _assertTransport(settled);
+  return settled;
 }
 
 function _snapProxy(opts) { return httpTransport.snapshotProxy(opts.proxy); }
@@ -315,7 +331,7 @@ function splitMultipartMixed(body, contentType) {
     if (sep === -1) throw E("est/bad-multipart", "a multipart part is missing its header/body separator");
     var rawHeaders = _strSlice(seg, 0, sep);
     var partBody = _strSlice(seg, _stripTwoLeadingEol(seg, sep), _stripOneTrailingEol(seg, seg.length));
-    var headers = {};
+    var headers = intrinsic.create(null);
     var lines = _splitCrlf(_unfoldHeaders(rawHeaders));
     for (var li = 0; li < lines.length; li++) {
       var line = lines[li];
@@ -476,7 +492,7 @@ function _partMediaType(contentType) {
 
 function parseServerKeygenResponse(body, contentType, opts) {
   opts = opts || {};
-  _knownOpts(opts, PARSE_SERVERKEYGEN_OPTS, "parseServerKeygenResponse");
+  opts = _knownOpts(opts, PARSE_SERVERKEYGEN_OPTS, "parseServerKeygenResponse");
   var parts = splitMultipartMixed(body, contentType);
   if (parts.length !== 2) throw E("est/bad-multipart", "a serverkeygen response must have exactly two parts (RFC 7030 sec. 4.4.2)");
   var keyPart = null, certPart = null, encrypted = false;
@@ -513,18 +529,18 @@ function parseServerKeygenResponse(body, contentType, opts) {
 }
 
 
-var CONTENT_TYPE_BY_OP = {
+var CONTENT_TYPE_BY_OP = intrinsic.assign(intrinsic.create(null), {
   cacerts: { media: "application/pkcs7-mime" },
   simpleenroll: { media: "application/pkcs7-mime", smimeTypes: ["certs-only"] },
   simplereenroll: { media: "application/pkcs7-mime", smimeTypes: ["certs-only"] },
   fullcmc: { media: "application/pkcs7-mime", smimeTypes: ["certs-only", "cmc-response"] },
   serverkeygen: { media: "multipart/mixed" },
   csrattrs: { media: "application/csrattrs" },
-};
+});
 
 var CLASSIFIABLE_OPS = ["cacerts", "simpleenroll", "simplereenroll", "fullcmc", "serverkeygen", "csrattrs"];
 
-var NOT_IMPLEMENTED_OPS = { fullcmc: 1 };
+var NOT_IMPLEMENTED_OPS = intrinsic.assign(intrinsic.create(null), { fullcmc: 1 });
 
 /**
  * @primitive  pki.est.classifyResponse
@@ -553,15 +569,15 @@ var NOT_IMPLEMENTED_OPS = { fullcmc: 1 };
  */
 function classifyResponse(status, headers, body, opts) {
   opts = opts || {};
-  _knownOpts(opts, CLASSIFY_OPTS, "classifyResponse");
+  opts = _knownOpts(opts, CLASSIFY_OPTS, "classifyResponse");
   var op = opts.op;
   if (op !== undefined && op !== null && CLASSIFIABLE_OPS.indexOf(op) === -1) throw E("est/unsupported-operation", "unrecognized EST operation " + guard.text.showValue(op));
-  var h = {
+  var h = intrinsic.assign(intrinsic.create(null), {
     "content-type": _ciHeader(headers, "content-type"),
     "retry-after": _ciHeader(headers, "retry-after"),
     "location": _ciHeader(headers, "location"),
     "www-authenticate": _ciHeaderList(headers, "www-authenticate"),
-  };
+  });
   if (status === 200) {
     var spec = CONTENT_TYPE_BY_OP[op];
     var ct = h["content-type"] || "";
@@ -625,7 +641,7 @@ function classifyResponse(status, headers, body, opts) {
  */
 function paths(baseUrl, opts) {
   opts = opts || {};
-  _knownOpts(opts, PATHS_OPTS, "paths");
+  opts = _knownOpts(opts, PATHS_OPTS, "paths");
   var base = String(baseUrl);
   var prefix = base.slice(0, _stripTrailingSlashEnd(base)) + "/.well-known/est";
   if (opts.label != null) {
@@ -635,7 +651,7 @@ function paths(baseUrl, opts) {
     }
     prefix += "/" + label;
   }
-  var out = {};
+  var out = intrinsic.create(null);
   OPERATIONS.forEach(function (op) { out[op] = prefix + "/" + op; });
   return out;
 }
@@ -845,7 +861,7 @@ function _authScheme(opts) {
 function _authUser(opts) { return opts.auth && opts.auth.username !== undefined ? opts.auth.username : opts.username; }
 function _authPass(opts) { return opts.auth && opts.auth.password !== undefined ? opts.auth.password : opts.password; }
 function _hasCreds(opts) { return _authUser(opts) !== undefined || _authPass(opts) !== undefined; }
-var DIGEST_CODES = { unsupportedAlgorithm: "est/digest-unsupported-algorithm", weakAlgorithm: "est/digest-weak-algorithm", noQop: "est/digest-no-qop", badChallenge: "est/digest-bad-challenge" };
+var DIGEST_CODES = intrinsic.assign(intrinsic.create(null), { unsupportedAlgorithm: "est/digest-unsupported-algorithm", weakAlgorithm: "est/digest-weak-algorithm", noQop: "est/digest-no-qop", badChallenge: "est/digest-bad-challenge" });
 function _digestPolicy(opts) { return { allowMD5: !!(opts.auth && opts.auth.allowMD5), allowLegacyQop: !!(opts.auth && opts.auth.allowLegacyQop), codes: DIGEST_CODES }; }
 
 function _drive(method, url, body, headers, opts, transport, budgets) {
@@ -882,14 +898,14 @@ function _drive(method, url, body, headers, opts, transport, budgets) {
   }
   function step() {
     var hopBody = (typeof body === "function" && budgets.onAttempt) ? budgets.onAttempt() : body;
-    return guard.async.awaited(transport({ method: method, url: url.href, headers: _headersFor(url), body: hopBody, tls: _tlsFor(url), proxy: budgets.proxy, timeout: budgets.timeout, maxResponseBytes: budgets.maxResponseBytes }), E, "est/bad-input", "opts.transport").then(function (res) {
+    return guard.async.invoked(transport, [{ method: method, url: url.href, headers: _headersFor(url), body: hopBody, tls: _tlsFor(url), proxy: budgets.proxy, timeout: budgets.timeout, maxResponseBytes: budgets.maxResponseBytes }], E, "est/bad-input", "opts.transport").then(function (res) {
       res = res || {};
       var blen = _bodyLen(res);
       if (blen > budgets.maxResponseBytes) throw E("est/response-too-large", "the response body (" + blen + " bytes) exceeds the " + budgets.maxResponseBytes + "-byte cap (RFC 7030 sec. 6)");
-      var h = {
+      var h = intrinsic.assign(intrinsic.create(null), {
         location: _ciHeader(res.headers, "location"),
         "www-authenticate": _ciHeaderList(res.headers, "www-authenticate"),
-      };
+      });
       var status = res.status;
       if (status >= 300 && status < 400) {
         if (redirects >= budgets.maxRedirects) throw E("est/too-many-redirects", "the redirect chain exceeded maxRedirects=" + budgets.maxRedirects + " (RFC 7030 sec. 3.2.1)");
@@ -945,13 +961,16 @@ function _drive(method, url, body, headers, opts, transport, budgets) {
   return step();
 }
 
-function _client(op, method, baseUrl, body, headers, opts, proxySnap, onAttempt) {
+/** @internal `checked` is the transport the verb already took at its door. Taking it again here
+ * would ask the caller's options a second time, and anything read in between could change the
+ * answer, so a verb that holds one passes it and this reads the option only when none was held. */
+function _client(op, method, baseUrl, body, headers, opts, proxySnap, onAttempt, checked) {
   var base;
   try { base = new URL(String(baseUrl)); }
   catch (e) { throw E("est/bad-url", "the EST base URL did not parse: " + guard.text.showValue(baseUrl), e); }
   if (base.search || base.hash) throw E("est/bad-url", "the EST base URL must not carry a query or fragment component (RFC 7030 sec. 3.2.2)");
   var url = _parseUrl(paths(baseUrl, { label: opts.label })[op]);
-  var transport = opts.transport;
+  var transport = checked !== undefined ? checked : _assertTransport(opts);
   if (!transport) {
     var t = opts.tls || {};
     var hasAnchors = t.anchors !== undefined && t.anchors !== null && !(Array.isArray(t.anchors) && t.anchors.length === 0);
@@ -1086,16 +1105,23 @@ function fullcmc(baseUrl, request, opts) {
   var der, wanted, sent;
   try {
     if (typeof opts !== "object" || Buffer.isBuffer(opts)) throw E("est/bad-input", "pki.est.fullcmc options must be an object");
-    _knownOpts(opts, FULLCMC_OPTS, "fullcmc");
+    opts = _knownOpts(opts, FULLCMC_OPTS, "fullcmc");
+    /** @internal Held from the door, before the request is read. What follows traverses the
+     * caller's nested objects, and one of those reads must not be able to change which transport
+     * the request goes out on, so the value that was checked is the value carried below. */
+    var carriedTransport = opts.transport;
     var proxySnap;
     try { proxySnap = _snapProxy(opts); } catch (_pe) { throw E("est/bad-input", "the options object could not be read", _pe); }
     der = _cmcRequestDer(request);
     wanted = _requestedPublicKeys(der);
     sent = _cmcSent(opts, der);
+    /** @internal The copy below keeps own properties only, and a defaults bag holds its options on
+     * a prototype, so the transport is put back from the value held at the door. */
     opts = _shallowCopy(opts);
+    if (carriedTransport !== undefined) opts.transport = carriedTransport;
     var body = transferEncode(der);
     return _client("fullcmc", "POST", baseUrl, body,
-      { accept: "application/pkcs7-mime", "content-type": "application/pkcs7-mime; smime-type=CMC-request" }, opts, proxySnap)
+      { accept: "application/pkcs7-mime", "content-type": "application/pkcs7-mime; smime-type=CMC-request" }, opts, proxySnap, undefined, carriedTransport)
       .then(function (res) { return _fullcmcResult(res, opts, wanted, sent); });
   } catch (e) {
     return _rej(e);
@@ -1109,7 +1135,7 @@ function _correlateIssued(bag, wanted, arm) {
       "this /fullcmc request declared no certification request whose key a returned certificate could be " +
       "matched against, so a " + arm + " response cannot be read as an issuance (RFC 5272 sec. 4.1)");
   }
-  var byKey = {};
+  var byKey = intrinsic.create(null);
   wanted.forEach(function (k) {
     var hex = k.toString("hex");
     if (!byKey[hex]) byKey[hex] = { key: k, want: 0, have: null };
@@ -1211,8 +1237,8 @@ function _copyBytes(v) {
 }
 
 function _requestBinding(der) {
-  var out = { transactionId: undefined, senderNonce: undefined, dataReturn: undefined, bodyPartIDs: undefined,
-    bodyPartPaths: undefined };
+  var out = intrinsic.assign(intrinsic.create(null), { transactionId: undefined, senderNonce: undefined, dataReturn: undefined, bodyPartIDs: undefined,
+    bodyPartPaths: undefined });
   var body = cmcFmt.parse(der);
   var ids = [];
   var paths = [];
@@ -1287,16 +1313,16 @@ function _assertAgrees(name, supplied, carried) {
 
 function _copyRecipient(r) {
   if (!r || typeof r !== "object") return r;
-  var out = {}, k;
+  var out = intrinsic.create(null), k;
   for (k in r) { if (_hasOwn(r, k)) out[k] = _copyBytes(r[k]); }
   return out;
 }
 
 function _shallowCopy(o) {
-  var out = {}, k;
+  var out = intrinsic.create(null), k;
   for (k in o) { if (_hasOwn(o, k)) out[k] = o[k]; }
   if (out.auth && typeof out.auth === "object") {
-    var a = {}, ak;
+    var a = intrinsic.create(null), ak;
     for (ak in out.auth) { if (_hasOwn(out.auth, ak)) a[ak] = out.auth[ak]; }
     out.auth = a;
   }
@@ -1414,9 +1440,12 @@ function _causedBy(e, target) {
   return false;
 }
 
-var ENROLL_HEADERS = { accept: "application/pkcs7-mime", "content-type": "application/pkcs10" };
+var ENROLL_HEADERS = intrinsic.assign(intrinsic.create(null), { accept: "application/pkcs7-mime", "content-type": "application/pkcs10" });
 
 function _enrollBound(op, baseUrl, builder, opts, proxySnap) {
+  /** @internal Held before anything else the caller supplied is read, and carried to the client:
+   * the builder runs during the handshake, so a later read could answer with a different value. */
+  var checkedTransport = opts.transport;
   if (_authScheme(opts) === "digest") {
     throw E("est/channel-binding-digest-unsupported",
       "Digest authentication cannot be combined with a channel-bound CSR builder: the Authorization header " +
@@ -1443,7 +1472,7 @@ function _enrollBound(op, baseUrl, builder, opts, proxySnap) {
         .then(null, function (e) { attempt.error = e; attempt.done = true; throw e; });
     };
   }
-  return _client(op, "POST", baseUrl, hopBody, ENROLL_HEADERS, opts, proxySnap, hopBody)
+  return _client(op, "POST", baseUrl, hopBody, ENROLL_HEADERS, opts, proxySnap, hopBody, checkedTransport)
     .then(function (res) {
       if (current && current.error) throw current.error;
       if (!current || !current.done) {
@@ -1461,10 +1490,11 @@ function _enrollBound(op, baseUrl, builder, opts, proxySnap) {
 
 function _enroll(op, baseUrl, csrInput, opts, proxySnap) {
   if (typeof csrInput === "function") return _enrollBound(op, baseUrl, csrInput, opts, proxySnap);
+  var checkedTransport = opts.transport;
   var csrDer = _csrDer(csrInput);
   var spki = csr.parse(csrDer).subjectPublicKeyInfo;
   var body = transferEncode(csrDer);
-  return _client(op, "POST", baseUrl, body, ENROLL_HEADERS, opts, proxySnap)
+  return _client(op, "POST", baseUrl, body, ENROLL_HEADERS, opts, proxySnap, undefined, checkedTransport)
     .then(function (res) { return _certsResult(op, res, opts, spki); });
 }
 
@@ -1505,8 +1535,8 @@ function cacerts(baseUrl, opts) {
   opts = opts || {};
   var proxySnap; try { proxySnap = _snapProxy(opts); } catch (_pe) { return _rej(E("est/bad-input", "the options object could not be read", _pe)); }
   return Promise.resolve().then(function () {
-    _knownOpts(opts, CACERTS_OPTS, "cacerts");
-    return _client("cacerts", "GET", baseUrl, null, { accept: "application/pkcs7-mime" }, opts, proxySnap);
+    opts = _knownOpts(opts, CACERTS_OPTS, "cacerts");
+    return _client("cacerts", "GET", baseUrl, null, { accept: "application/pkcs7-mime" }, opts, proxySnap, undefined, opts.transport);
   }).then(function (res) { return _certsResult("cacerts", res, opts, null); });
 }
 
@@ -1571,7 +1601,7 @@ function simpleenroll(baseUrl, csrInput, opts) {
   opts = opts || {};
   var proxySnap; try { proxySnap = _snapProxy(opts); } catch (_pe) { return _rej(E("est/bad-input", "the options object could not be read", _pe)); }
   return Promise.resolve().then(function () {
-    _knownOpts(opts, SIMPLEENROLL_OPTS, "simpleenroll");
+    opts = _knownOpts(opts, SIMPLEENROLL_OPTS, "simpleenroll");
     return _enroll("simpleenroll", baseUrl, csrInput, opts, proxySnap);
   });
 }
@@ -1611,7 +1641,7 @@ function simplereenroll(baseUrl, csrInput, opts) {
   opts = opts || {};
   var proxySnap; try { proxySnap = _snapProxy(opts); } catch (_pe) { return _rej(E("est/bad-input", "the options object could not be read", _pe)); }
   return Promise.resolve().then(function () {
-    _knownOpts(opts, SIMPLEREENROLL_OPTS, "simplereenroll");
+    opts = _knownOpts(opts, SIMPLEREENROLL_OPTS, "simplereenroll");
     if (!opts.oldCert) throw E("est/bad-input", "simplereenroll requires opts.oldCert (the certificate being renewed, RFC 7030 sec. 4.2.2)");
     if (typeof csrInput !== "function") reenrollGuard(opts.oldCert, _csrDer(csrInput));
     return _enroll("simplereenroll", baseUrl, csrInput, opts, proxySnap);
@@ -1755,7 +1785,8 @@ function serverkeygen(baseUrl, csrInput, opts) {
   opts = opts || {};
   var proxySnap; try { proxySnap = _snapProxy(opts); } catch (_pe) { return _rej(E("est/bad-input", "the options object could not be read", _pe)); }
   return Promise.resolve().then(function () {
-    _knownOpts(opts, SERVERKEYGEN_OPTS, "serverkeygen");
+    opts = _knownOpts(opts, SERVERKEYGEN_OPTS, "serverkeygen");
+    var checkedTransport = opts.transport;
     var csrDer = _csrDer(csrInput);
     var derived = _serverkeygenEncryptionFromCsr(csrDer);
     if (opts.requestedEncryption !== undefined && !!opts.requestedEncryption !== derived.requestedEncryption) throw E("est/bad-input", "opts.requestedEncryption (" + !!opts.requestedEncryption + ") contradicts the CSR's advertised key-encryption attribute (" + derived.requestedEncryption + ") (RFC 7030 sec. 4.4.1)");
@@ -1772,7 +1803,7 @@ function serverkeygen(baseUrl, csrInput, opts) {
     if ((opts.expectedRecipientKeyId !== undefined || opts.expectedRecipientIssuerSerial != null) && !derived.requestedEncryption) {
       throw E("est/bad-input", "a recipient expectation (expectedRecipientKeyId / expectedRecipientIssuerSerial) implies an encrypted key, but the CSR advertised no DecryptKeyIdentifier / AsymmetricDecryptKeyIdentifier attribute (RFC 7030 sec. 4.4.1)");
     }
-    return _client("serverkeygen", "POST", baseUrl, transferEncode(csrDer), { accept: "multipart/mixed", "content-type": "application/pkcs10" }, opts, proxySnap)
+    return _client("serverkeygen", "POST", baseUrl, transferEncode(csrDer), { accept: "multipart/mixed", "content-type": "application/pkcs10" }, opts, proxySnap, undefined, checkedTransport)
       .then(function (res) { return _serverkeygenResult(res, opts, derived); });
   });
 }
@@ -1816,8 +1847,8 @@ function csrattrs(baseUrl, opts) {
   opts = opts || {};
   var proxySnap; try { proxySnap = _snapProxy(opts); } catch (_pe) { return _rej(E("est/bad-input", "the options object could not be read", _pe)); }
   return Promise.resolve().then(function () {
-    _knownOpts(opts, CSRATTRS_OPTS, "csrattrs");
-    return _client("csrattrs", "GET", baseUrl, null, { accept: "application/csrattrs" }, opts, proxySnap);
+    opts = _knownOpts(opts, CSRATTRS_OPTS, "csrattrs");
+    return _client("csrattrs", "GET", baseUrl, null, { accept: "application/csrattrs" }, opts, proxySnap, undefined, opts.transport);
   }).then(function (res) { return _csrattrsResult(res, opts); });
 }
 

package/lib/guard-async.js

@@ -6,6 +6,7 @@ var _intrinsic = require("./guard-intrinsic");
 var _resolve = _intrinsic.uncurry(_intrinsic.promiseResolve);
 var _reject = _intrinsic.uncurry(_intrinsic.promiseReject);
 var _apply = _intrinsic.apply;
+var _String = _intrinsic.String;
 var _Promise = Promise;
 // @internal
 // @enforced-by behavioral -- the rule has no rename-proof code shape (it is the ABSENCE of a wrapper
@@ -29,4 +30,19 @@ function awaited(value, E, code, label) {
   });
 }
 
-module.exports = _intrinsic.freeze({ deferred: deferred, awaited: awaited });
+// @internal
+// @enforced-by behavioral -- a RED vector drives a bound class constructor through a client verb
+/** @internal Call a caller-supplied producer and hand back its promise. A synchronous throw from
+ * the call becomes the boundary's typed error, the same as a rejected promise or a non-thenable
+ * return already does. Some values pass a callability check and still throw when called: binding a
+ * class constructor hides its source, and a proxy can throw from its apply trap. */
+function invoked(fn, args, E, code, label) {
+  var out;
+  try { out = _apply(fn, undefined, args); }
+  catch (e) {
+    throw E(code, label + " threw when it was called: " + (e && e.message ? e.message : _String(e)), e);
+  }
+  return awaited(out, E, code, label);
+}
+
+module.exports = _intrinsic.freeze({ deferred: deferred, awaited: awaited, invoked: invoked });