core-3nweb-client-lib 0.34.0 → 0.34.2

package/build/core/asmail/key-verification.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -34,13 +34,25 @@ async function checkAndExtractPKey(client, resolver, address, certs) {
     address = (0, canonical_address_1.toCanonicalAddress)(address);
     const validAt = Math.round(Date.now() / 1000);
     // get MailerId provider's info with a root certificate(s)
-    const data = await (0, service_locator_1.getMailerIdInfoFor)(resolver, client, address);
-    // TODO choose proper root certificate, as it may not be current one
-    const rootAddr = data.domain;
-    const rootCert = data.info.currentCert;
+    const { domain: rootAddr, rootCert } = await getRootCertForKey(certs.provCert.kid, resolver, client, address);
     const pkey = mid_sigs_NaCl_Ed_1.relyingParty.verifyPubKey(certs.pkeyCert, address, { user: certs.userCert, prov: certs.provCert, root: rootCert }, rootAddr, validAt);
     return pkey;
 }
+async function getRootCertForKey(kid, resolver, client, address) {
+    const { domain, info: { currentCert, previousCerts } } = await (0, service_locator_1.getMailerIdInfoFor)(resolver, client, address);
+    let rootCert;
+    if (currentCert.kid === kid) {
+        rootCert = currentCert;
+    }
+    else {
+        const pastCert = previousCerts.find((cert) => (cert.kid === kid));
+        if (!pastCert) {
+            throw new Error(`Root cert for given key id is not found in server's reply.`);
+        }
+        rootCert = pastCert;
+    }
+    return { domain, rootCert };
+}
 /**
  * This returns a promise, resolvable to public key and related address, when
  * certificates' verification is successful, and rejectable in all other cases.
@@ -62,10 +74,7 @@ async function checkAndExtractPKeyWithAddress(client, resolver, certs, validAt)
         throw (0, mid_sigs_NaCl_Ed_1.makeMalformedCertsException)(`Cannot read public key certificate`, err);
     }
     // get MailerId provider's info with a root certificate(s)
-    const data = await (0, service_locator_1.getMailerIdInfoFor)(resolver, client, address);
-    // TODO choose proper root certificate, as it may not be current one
-    const rootAddr = data.domain;
-    const rootCert = data.info.currentCert;
+    const { domain: rootAddr, rootCert } = await getRootCertForKey(certs.provCert.kid, resolver, client, address);
     const pkey = mid_sigs_NaCl_Ed_1.relyingParty.verifyPubKey(certs.pkeyCert, address, { user: certs.userCert, prov: certs.provCert, root: rootCert }, rootAddr, validAt);
     return { address, pkey };
 }

package/build/core-ipc/json-ipc-wrapping/service-side-wrap.js

@@ -41,7 +41,15 @@ function wrapReqReplyFunc(srvOrFn, funcOrTransforms, transforms) {
         let promise = (args ?
             func.call(srv, ...args) :
             func.call(srv));
-        promise = promise === null || promise === void 0 ? void 0 : promise.then(result => resultToBuffer(result, transforms));
+        if (promise === undefined) {
+            promise = Promise.resolve();
+        }
+        else if ((promise === null) || !promise.then) {
+            promise = Promise.resolve(resultToBuffer(promise, transforms));
+        }
+        else {
+            promise = promise.then(result => resultToBuffer(result, transforms));
+        }
         return { promise };
     };
 }