@open-charging-cloud/chargy-core 0.11.0 → 0.11.2

package/README.md

@@ -181,7 +181,7 @@ npx playwright install chromium
 ## Publishing
 
 ```bash
-npm version 0.11.0 --no-git-tag-version
+npm version 0.11.2 --no-git-tag-version
 npm run verify
 npm pack --dry-run
 npm pack

package/dist/browser/index.js

@@ -12232,33 +12232,58 @@ var Chargy = class {
       );
     });
     const publicKeyDER = ASN1_PublicKey.decode(publicKeyBuffer, "der");
-    const KeyType_OID = publicKeyDER.oids[0].join(".");
+    const firstOID = publicKeyDER.oids[0];
+    if (firstOID === void 0)
+      throw new Error("The SubjectPublicKeyInfo algorithm identifier is missing!");
+    const KeyType_OID = firstOID.join(".");
     let KeyType = "unknown";
     switch (KeyType_OID) {
       case "1.2.840.10045.2.1":
         KeyType = "ecPublicKey";
         break;
+      case "1.3.101.112":
+      case "1.3.101.113":
+        KeyType = "EdDSA";
+        break;
+      case "2.16.840.1.101.3.4.3.18":
+        KeyType = "ML-DSA";
+        break;
     }
-    const Curve_OID = publicKeyDER.oids[1].join(".");
-    let Curve = "unknown";
-    switch (Curve_OID) {
+    const Algorithm_OID = publicKeyDER.oids[1]?.join(".") ?? KeyType_OID;
+    let Algorithm = "unknown";
+    switch (Algorithm_OID) {
+      case "1.3.101.112":
+        Algorithm = "Ed25519";
+        break;
+      case "1.3.101.113":
+        Algorithm = "Ed448";
+        break;
+      case "2.16.840.1.101.3.4.3.18":
+        Algorithm = "ML-DSA-65";
+        break;
       // Koblitz 224-bit curve
       case "1.3.132.0.32":
-        Curve = "secp224k1";
+        Algorithm = "secp224k1";
         break;
       // NIST/ANSI X9.62 named 256-bit elliptic curve used with SHA256
       case "1.2.840.10045.3.1.7":
-        Curve = "secp256r1";
+        Algorithm = "secp256r1";
         break;
       // NIST/ANSI X9.62 named 384-bit elliptic curve used with SHA384
       case "1.3.132.0.34":
-        Curve = "secp384r1";
+        Algorithm = "secp384r1";
         break;
       // NIST/ANSI X9.62 named 521-bit elliptic curve used with SHA512
       case "1.3.132.0.35":
-        Curve = "secp521r1";
+        Algorithm = "secp521r1";
         break;
     }
+    const publicKeyData = new Uint8Array(publicKeyDER.publicKey.data);
+    const expectedLength = Algorithm === "Ed25519" ? 32 : Algorithm === "Ed448" ? 57 : Algorithm === "ML-DSA-65" ? 1952 : void 0;
+    if (publicKeyDER.publicKey.unused !== void 0 && publicKeyDER.publicKey.unused !== 0)
+      throw new Error("The SubjectPublicKeyInfo public key has unused bits!");
+    if (expectedLength !== void 0 && publicKeyData.length !== expectedLength)
+      throw new Error(`Invalid ${Algorithm} public key length: expected ${expectedLength} bytes, got ${publicKeyData.length}!`);
     return {
       "@id": keyId,
       "@context": "https://open.charging.cloud/contexts/CTR+json",
@@ -12267,15 +12292,15 @@ var Chargy = class {
           "@id": keyId,
           "@context": "https://open.charging.cloud/contexts/publicKey+json",
           "subject": keyId,
-          type: {
+          type: KeyType === "EdDSA" || KeyType === "ML-DSA" ? KeyType : {
             oid: KeyType_OID,
             name: KeyType
           },
           algorithm: {
-            oid: Curve_OID,
-            name: Curve
+            oid: Algorithm_OID,
+            name: Algorithm
           },
-          value: buf2hex(publicKeyDER.publicKey.data),
+          value: buf2hex(publicKeyData),
           certainty: 0
         }
       ]
@@ -12289,15 +12314,36 @@ var Chargy = class {
     const publicKeyHEX = textContent.replace(/\s+/g, "");
     return publicKeyFile && publicKeyHEX.length >= 80 && publicKeyHEX.length % 2 === 0 && publicKeyHEX.startsWith("30") && /^[0-9a-fA-F]+$/.test(publicKeyHEX);
   }
-  TryToGetDERPublicKeyHEX(fileName, textContent) {
+  TryToGetPublicKeyHEX(fileName, textContent) {
     if (textContent == null)
       return void 0;
     if (textContent.startsWith("-----BEGIN PUBLIC KEY-----") && textContent.endsWith("-----END PUBLIC KEY-----")) {
       const publicKeyPEM = textContent.replace("-----BEGIN PUBLIC KEY-----", "").replace("-----END PUBLIC KEY-----", "").split("\n").map((line) => line.trim()).filter((line) => line !== "" && !line.startsWith("#")).join("");
-      return buf2hex(import_buffer2.Buffer.from(publicKeyPEM, "base64"));
+      try {
+        const publicKeyDER = import_buffer2.Buffer.from(publicKeyPEM, "base64");
+        const publicKey = this.TryToParseDERPublicKey(
+          this.PublicKeyIdFromFileName(fileName),
+          publicKeyDER
+        ).publicKeys[0];
+        const algorithm = typeof publicKey?.algorithm === "string" ? publicKey.algorithm : publicKey?.algorithm.name;
+        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm === "ML-DSA-65" ? publicKey?.value : buf2hex(publicKeyDER);
+      } catch {
+        return void 0;
+      }
+    }
+    if (this.IsHexEncodedPublicKeyFile(fileName, textContent)) {
+      try {
+        const publicKeyDER = import_buffer2.Buffer.from(textContent.replace(/\s+/g, ""), "hex");
+        const publicKey = this.TryToParseDERPublicKey(
+          this.PublicKeyIdFromFileName(fileName),
+          publicKeyDER
+        ).publicKeys[0];
+        const algorithm = typeof publicKey?.algorithm === "string" ? publicKey.algorithm : publicKey?.algorithm.name;
+        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm === "ML-DSA-65" ? publicKey?.value : buf2hex(publicKeyDER);
+      } catch {
+        return void 0;
+      }
     }
-    if (this.IsHexEncodedPublicKeyFile(fileName, textContent))
-      return textContent.replace(/\s+/g, "");
     return void 0;
   }
   TryToCreatePublicKeyLookup(processedFiles) {
@@ -12923,7 +12969,7 @@ var Chargy = class {
       let textContent = new TextDecoder("utf-8").decode(expandedFile.data).trim();
       if (textContent.charCodeAt(0) === 65279)
         textContent = textContent.substring(1);
-      const publicKeyHEX = this.TryToGetDERPublicKeyHEX(expandedFile.name, textContent);
+      const publicKeyHEX = this.TryToGetPublicKeyHEX(expandedFile.name, textContent);
       if (publicKeyHEX != null)
         publicKeyHEXLookup.set(this.PublicKeyIdFromFileName(expandedFile.name), publicKeyHEX);
     }