node-opcua-pki 6.22.0 → 6.22.1

package/dist/index.mjs

@@ -411,8 +411,32 @@ function passinArg(passphrase = "") {
 function renderForDisplay(file, args) {
   return [file, ...args].map((a) => a === "" || /[\s"'`$\\]/.test(a) ? JSON.stringify(a) : a).join(" ");
 }
+function hasUnsafeArgChar(value) {
+  for (const ch of value) {
+    const code = ch.codePointAt(0);
+    if (code < 32 || code === 127) {
+      return true;
+    }
+    if (code < 128) {
+      continue;
+    }
+    if (/[\p{L}\p{N}\p{M}]/u.test(ch)) {
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
+function checkArgs(file, args) {
+  for (const value of [file, ...args]) {
+    if (typeof value === "string" && hasUnsafeArgChar(value)) {
+      throw new Error(`execute_openssl: refusing argument with an unexpected character: ${JSON.stringify(value)}`);
+    }
+  }
+}
 async function execute2(file, args, options) {
   const from = new Error();
+  checkArgs(file, args);
   options.cwd = options.cwd || process.cwd();
   if (!g_config.silent) {
     warningLog(chalk2.cyan("                  CWD         "), options.cwd);
@@ -1128,18 +1152,31 @@ function makeFingerprint(certificate) {
 function short(stringToShorten) {
   return stringToShorten.substring(0, 10);
 }
-var forbiddenChars = /[\x00-\x1F<>:"/\\|?*]/g;
+var disallowedInLabel = /[^A-Za-z0-9._ -]/g;
+function toFilenameLabel(commonName) {
+  const label = (commonName || "").normalize("NFKC").replace(disallowedInLabel, "_").replace(/[^\x20-\x7E]/g, "").slice(0, 64).trim();
+  return label || "certificate";
+}
 function buildIdealCertificateName(certificate) {
   const chain = coerceCertificateChain(certificate);
   const fingerprint = makeFingerprint(chain);
   try {
     const commonName = exploreCertificate(chain[0]).tbsCertificate.subject.commonName || "";
-    const sanitizedCommonName = commonName.replace(forbiddenChars, "_");
+    const sanitizedCommonName = toFilenameLabel(commonName);
     return `${sanitizedCommonName}[${fingerprint}]`;
   } catch (_err) {
     return `invalid_certificate_[${fingerprint}]`;
   }
 }
+function safeStoreJoin(folder, filename) {
+  const full = path4.resolve(folder, filename);
+  const base = path4.resolve(folder);
+  if (full !== base && !full.startsWith(base + path4.sep)) {
+    warningLog("refusing to write certificate outside its store folder:", filename);
+    throw new Error(`certificate filename escapes its store folder: ${filename}`);
+  }
+  return full;
+}
 function findMatchingIssuerKey(entries, wantedIssuerKey) {
   return entries.filter((entry) => {
     const info = getOrComputeInfo(entry);
@@ -1715,7 +1752,7 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
         } catch (_err) {
           return "BadCertificateInvalid";
         }
-        const filename = path4.join(this.rejectedFolder, `${buildIdealCertificateName(leafCertificate)}.pem`);
+        const filename = safeStoreJoin(this.rejectedFolder, `${buildIdealCertificateName(leafCertificate)}.pem`);
         debugLog("certificate has never been seen before and is now rejected (untrusted) ", filename);
         await fsWriteFile(filename, toPem(chain, "CERTIFICATE"));
         this.#thumbs.rejected.set(fingerprint, { certificate: leafCertificate, filename });
@@ -2123,7 +2160,7 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
     if (this.#thumbs.issuers.certs.has(fingerprint)) {
       return "Good" /* Good */;
     }
-    const filename = path4.join(this.issuersCertFolder, `issuer_${buildIdealCertificateName(certificate)}.pem`);
+    const filename = safeStoreJoin(this.issuersCertFolder, `issuer_${buildIdealCertificateName(certificate)}.pem`);
     await fs7.promises.writeFile(filename, pemCertificate, "ascii");
     this.#thumbs.issuers.certs.set(fingerprint, { certificate, filename });
     if (addInTrustList) {
@@ -2582,7 +2619,7 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
       let status = await this.#checkRejectedOrTrusted(certificate);
       if (status === "unknown") {
         const pem = toPem(chain, "CERTIFICATE");
-        const filename = path4.join(this.rejectedFolder, `${buildIdealCertificateName(certificate)}.pem`);
+        const filename = safeStoreJoin(this.rejectedFolder, `${buildIdealCertificateName(certificate)}.pem`);
         await fs7.promises.writeFile(filename, pem);
         this.#thumbs.rejected.set(fingerprint, { certificate, filename });
         status = "rejected";
@@ -2599,7 +2636,7 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
           throw new Error(`#moveCertificate: certificate ${fingerprint.substring(0, 10)} not found in ${status} index`);
         }
         const destFolder = newStatus === "trusted" ? this.trustedFolder : this.rejectedFolder;
-        const certificateDest = path4.join(destFolder, path4.basename(srcEntry.filename));
+        const certificateDest = safeStoreJoin(destFolder, path4.basename(srcEntry.filename));
         debugLog("#moveCertificate", fingerprint.substring(0, 10), "old name", srcEntry.filename);
         debugLog("#moveCertificate", fingerprint.substring(0, 10), "new name", certificateDest);
         await fs7.promises.rename(srcEntry.filename, certificateDest);
@@ -3101,6 +3138,8 @@ export {
   isRootIssuer,
   makeFingerprint,
   quote,
-  resolvePrivateKeyPassphrase
+  resolvePrivateKeyPassphrase,
+  safeStoreJoin,
+  toFilenameLabel
 };
 //# sourceMappingURL=index.mjs.map