@oracle-agent/oracle 0.4.2 → 0.6.0

package/src/public-api/connect-agent.mjs

@@ -53,6 +53,18 @@ export class SecretLeakError extends Error {
 const FORBIDDEN_KEY_RE =
   /(private[_-]?key|secret|bearer|keystore|mnemonic|seed[_-]?phrase|passphrase|password|api[_-]?key|access[_-]?token|auth[_-]?token|session[_-]?token|signer[_-]?url|signature)/i;
 
+/** Short wallet-export aliases need exact normalized matching. Substring
+ * matching `wif`, for example, would incorrectly reject an unrelated key such
+ * as `swift`. Removing common separators catches snake/kebab/spaced variants
+ * without widening those short aliases into arbitrary words. */
+const FORBIDDEN_KEY_ALIASES = Object.freeze(["privkey", "wif", "xprv", "seed"]);
+
+function isForbiddenKeyName(key) {
+  const text = String(key);
+  const normalized = text.toLowerCase().replace(/[\s._-]+/g, "");
+  return FORBIDDEN_KEY_RE.test(text) || FORBIDDEN_KEY_ALIASES.includes(normalized);
+}
+
 /** String-value shapes that must never appear in any object we return. */
 const FORBIDDEN_VALUE_RULES = Object.freeze([
   // 32-byte hex — the shape of a raw EVM private key / session secret. Public
@@ -69,8 +81,12 @@ const FORBIDDEN_VALUE_RULES = Object.freeze([
   // gets disabled. Smuggling a key inside a longer string is still caught at
   // the serialized layer for any non-allowlisted field.
   { rule: "raw-32-byte-hex-bare", re: /^[0-9a-fA-F]{64}$/ },
-  // Bitcoin WIF (mainnet 5/K/L, testnet c) — base58, 51-52 chars.
-  { rule: "bitcoin-wif", re: /\b[5KLc][1-9A-HJ-NP-Za-km-z]{50,51}\b/ },
+  // BIP-32 private extended keys. Public xpub/tpub/ypub/zpub identifiers are
+  // intentionally not matched; only their private-key counterparts fail.
+  { rule: "extended-private-key", re: /\b(?:xprv|tprv|yprv|zprv)[1-9A-HJ-NP-Za-km-z]{107}\b/ },
+  // Bitcoin WIF (mainnet 5/K/L, testnet uncompressed 9 or compressed c) —
+  // base58, 51-52 chars.
+  { rule: "bitcoin-wif", re: /\b[59KLc][1-9A-HJ-NP-Za-km-z]{50,51}\b/ },
   // BIP-39 mnemonic: 12/15/18/21/24 lowercase words. Detect a long run of
   // space-separated short alpha words rather than shipping the wordlist.
   { rule: "bip39-mnemonic", re: /\b(?:[a-z]{3,8}\s+){11,23}[a-z]{3,8}\b/ },
@@ -169,12 +185,15 @@ export function assertSerializedNoSecrets(value) {
   if (embedded.test(scanned)) {
     throw new SecretLeakError("$<serialized>", "raw-32-byte-hex-embedded");
   }
-  // Key names are checked against the serialized text too, so a key smuggled
-  // in via toJSON or a getter is still caught.
-  const keyHit = scanned.match(
-    /"([^"]*(?:private[_-]?key|secret|bearer|keystore|mnemonic|seed[_-]?phrase|passphrase|password|api[_-]?key|access[_-]?token|auth[_-]?token|session[_-]?token|signer[_-]?url)[^"]*)"\s*:/i
-  );
-  if (keyHit) throw new SecretLeakError(`$<serialized>.${keyHit[1]}`, "forbidden-key-name");
+  // Parse the exact serialized bytes with a reviver so escaped or toJSON-made
+  // key names receive the same normalization as real object properties. This
+  // avoids maintaining a second, inevitably drifting key-name regex.
+  JSON.parse(json, (key, item) => {
+    if (key && isForbiddenKeyName(key)) {
+      throw new SecretLeakError(`$<serialized>.${key}`, "forbidden-key-name");
+    }
+    return item;
+  });
   return json;
 }
 
@@ -207,7 +226,7 @@ export function assertNoSecretMaterial(value, path = "$", seen = new Set(), keyH
   if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) return value;
   if (value instanceof Map) {
     for (const [k, v] of value.entries()) {
-      if (typeof k === "string" && FORBIDDEN_KEY_RE.test(k)) {
+      if (typeof k === "string" && isForbiddenKeyName(k)) {
         throw new SecretLeakError(`${path}[${JSON.stringify(k)}]`, "forbidden-key-name");
       }
       assertNoSecretMaterial(k, `${path}[key]`, seen);
@@ -225,7 +244,7 @@ export function assertNoSecretMaterial(value, path = "$", seen = new Set(), keyH
     return value;
   }
   for (const [k, v] of Object.entries(value)) {
-    if (FORBIDDEN_KEY_RE.test(k)) {
+    if (isForbiddenKeyName(k)) {
       throw new SecretLeakError(`${path}.${k}`, "forbidden-key-name");
     }
     assertNoSecretMaterial(v, `${path}.${k}`, seen, k);