@blamejs/pki 0.1.31 → 0.2.0

package/lib/oid.js

@@ -39,6 +39,10 @@ var guard = require("./guard-all");
 
 var OidError = frameworkError.OidError;
 
+// (code, message) -> OidError, the factory shape the composed guards throw
+// through so a malformed identifier keeps the oid/* typed verdict.
+function _oidError(c, m) { return new OidError(c, m); }
+
 // FAMILIES -- OIDs grouped by their shared base arc (the "similar starting
 // variable" that defines a class). A member is `name: leaf`, where leaf is a
 // trailing arc (number) or a short arc array for a multi-level leaf; the full
@@ -302,11 +306,18 @@ Object.keys(FAMILIES).forEach(function (fam) {
 });
 
 function _assertDotted(dotted, who) {
-  // No leading-zero components: "01.2.840" is a key no decoded OID can match,
-  // and the arc converters round-trip it to a DIFFERENT OID ("1.2.840").
-  if (typeof dotted !== "string" || !/^(0|[1-9]\d*)(\.(0|[1-9]\d*))+$/.test(dotted)) {
-    throw new OidError("oid/bad-input", who + ": expected a dotted-decimal OID string (no leading-zero components)");
-  }
+  // SYNTAX only (canonical dotted form, no leading-zero arc that would round-trip
+  // to a DIFFERENT OID). For the LOOKUP entry points (name / has): a well-formed
+  // but non-encodable OID is simply not registered (a miss), not an error, so the
+  // X.660 arc bounds are waived (boundsCode null).
+  guard.identifier.assertCanonicalOid(dotted, _oidError, "oid/bad-input", who, null);
+}
+
+function _assertEncodable(dotted, who) {
+  // SYNTAX and the X.660 arc bounds -- for the paths that assert / convert a real
+  // encodable OID (toArcs / toDER / register), where an out-of-bounds arc is a
+  // hard reject (oid/bad-arc), so the string form agrees with the DER form.
+  guard.identifier.assertCanonicalOid(dotted, _oidError, "oid/bad-input", who, "oid/bad-arc");
 }
 
 // X.660 encodability: the root arc is 0..2 and, under roots 0 and 1, the
@@ -370,9 +381,11 @@ function has(dotted) {
  *   pki.oid.register("1.3.6.1.4.1.99999.1", "acmeWidgetPolicy");
  */
 function register(dotted, n) {
-  _assertDotted(dotted, "register");
+  // _assertDotted now enforces the X.660 arc bounds on the string form too, so
+  // the separate arc-based check register used to run is redundant here (it is
+  // kept for registerFamily, which validates arcs it assembles, not a string).
+  _assertEncodable(dotted, "register");
   if (typeof n !== "string" || n.length === 0) throw new OidError("oid/bad-input", "register: name must be a non-empty string");
-  _assertEncodableArcs(dotted.split(".").map(BigInt), "register");
   _index(dotted, n);
 }
 
@@ -432,7 +445,7 @@ function all() {
 // Number where safe and BigInt where an arc exceeds 2^53 (rare, but a
 // UUID-based OID arc can), so the round-trip never loses precision.
 function toArcs(dotted) {
-  _assertDotted(dotted, "toArcs");
+  _assertEncodable(dotted, "toArcs");
   return dotted.split(".").map(function (p) {
     var b = BigInt(p);
     return b <= 9007199254740991n ? Number(b) : b;
@@ -453,7 +466,7 @@ function fromArcs(arcs) {
 
 // DER convenience -- thin pass-throughs to the codec so callers reach for
 // one namespace when they have a dotted string in hand.
-function toDER(dotted) { _assertDotted(dotted, "toDER"); return asn1.build.oid(dotted); }
+function toDER(dotted) { _assertEncodable(dotted, "toDER"); return asn1.build.oid(dotted); }
 function fromDER(input) {
   var buf = guard.bytes.view(input, OidError, "oid/bad-input", "fromDER");
   var node = asn1.decode(buf);