feat: Add checkbox for showing certificates without private key

PeculiarVentures · May 30, 2024 · 4e8998e · 4e8998e
1 parent d807662
commit 4e8998e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 20 deletions.
diff --git a/example6.html b/example6.html
@@ -67,6 +67,10 @@ <h2>Certificate chain building</h2>
     <label for="certificates">Certificates:</label>
     <select id="certificates"></select>
   </div>
+  <div class="group">
+    <label for="withoutKey">Show certificates without private key</label>
+    <input type="checkbox" id="withoutKey">
+  </div>
   <div class="group">
     <button id="build">Build</button>
   </div>
@@ -113,18 +117,29 @@ <h2>Certificate chain building</h2>
       const providerID = $("providers").value;
       if (providerID) {
         const crypto = await ws.getCrypto(providerID);
-        fillCertificateSelect(crypto, $("certificates"))
+        fillCertificateSelect(crypto, $certificates, !$withoutKey.checked);
       }
     }
 
     $("providers").onchange = async () => {
       const providerID = $("providers").value;
-      const provider = await ws.getCrypto(providerID)
-      fillCertificateSelect(provider, $("certificates"))
+      const provider = await ws.getCrypto(providerID);
+      fillCertificateSelect(provider, $certificates, !$withoutKey.checked);
     }
 
+    const $providers = $("providers");
     const $build = $("build");
     const $chain = $("chain");
+    const $certificates = $("certificates");
+    const $withoutKey = $("withoutKey");
+
+    $withoutKey.onchange = () => {
+      (async () => {
+        const providerID = $providers.value;
+        const provider = await ws.getCrypto(providerID)
+        fillCertificateSelect(provider, $certificates, !$withoutKey.checked);
+      })();
+    }
 
     $build.onclick = async () => {
       $build.disabled = true;

diff --git a/src/helper.js b/src/helper.js
@@ -61,7 +61,7 @@ async function FillProviderSelect(domSelect) {
  * @param {*} crypto 
  * @param {*} domSelect 
  */
-async function fillCertificateSelect(provider, domSelect) {
+async function fillCertificateSelect(provider, domSelect, hasKey = true) {
   if (! await provider.isLoggedIn()) {
     await provider.login();
   }
@@ -80,19 +80,19 @@ async function fillCertificateSelect(provider, domSelect) {
 
   const certs = [];
   for (const certID of certIDs) {
-    for (const keyID of keyIDs) {
-      if (keyID.split("-")[2] === certID.split("-")[2]) {
-        try {
-          const cert = await provider.certStorage.getItem(certID);
-
-          certs.push({
-            id: certID,
-            item: cert,
-          });
-        } catch (e) {
-          console.error(`Cannot get certificate ${certID} from CertificateStorage. ${e.message}`);
-        }
-      }
+    const [, , certId] = certID.split("-");
+    if (hasKey && !keyIDs.some((keyID) => keyID.split("-")[2] === certId)) {
+      continue;
+    }
+    try {
+      const cert = await provider.certStorage.getItem(certID);
+
+      certs.push({
+        id: certID,
+        item: cert,
+      });
+    } catch (e) {
+      console.error(`Cannot get certificate ${certID} from CertificateStorage. ${e.message}`);
     }
   }
 
@@ -171,20 +171,27 @@ function GetCommonName(name) {
   return res ? res[1] : "Unknown";
 }
 
-async function GetCertificateKey(type, provider, certID) {
+async function GetCertificateKey(type, provider, certID, algorithm, extractable, usages) {
   const keyIDs = await provider.keyStorage.keys()
   for (const keyID of keyIDs) {
     const parts = keyID.split("-");
 
     if (parts[0] === type && parts[2] === certID.split("-")[2]) {
-      const key = await provider.keyStorage.getItem(keyID);
+      let key;
+      if (algorithm && extractable !== undefined && usages) {
+        key = await provider.keyStorage.getItem(keyID, algorithm, extractable, usages);
+      } else {
+        key = await provider.keyStorage.getItem(keyID);
+      }
       if (key) {
         return key;
       }
     }
   }
   if (type === "public") {
-    const cert = await provider.certStorage.getItem(certID);
+    const cert = (algorithm && extractable !== undefined && usages)
+      ? await provider.certStorage.getItem(certID, algorithm, extractable, usages)
+      : await provider.certStorage.getItem(certID);
     if (cert) {
       return cert.publicKey;
     }