node-opcua-server-configuration 2.165.2 → 2.167.0

package/source/server/trust_list_server.ts

@@ -2,13 +2,18 @@ import fs from "node:fs";
 import path from "node:path";
 import { BinaryStream } from "node-opcua-binary-stream";
 import type { OPCUACertificateManager } from "node-opcua-certificate-manager";
-import { readCertificate, readCertificateRevocationList } from "node-opcua-crypto";
+import { readCertificateChainAsync, readCertificateRevocationList } from "node-opcua-crypto";
 import { make_errorLog } from "node-opcua-debug";
 import type { AbstractFs } from "node-opcua-file-transfer";
 import { TrustListDataType } from "node-opcua-types";
 
 const errorLog = make_errorLog("TrustListServer");
 
+/**
+ * Read all certificate (chains) and CRLs in a folder
+ * @param folder 
+ * @returns 
+ */
 async function readAll(folder: string): Promise<Buffer[]> {
     const results: Buffer[] = [];
     const files = await fs.promises.readdir(folder);
@@ -16,8 +21,9 @@ async function readAll(folder: string): Promise<Buffer[]> {
         const file = path.join(folder, f);
         const ext = path.extname(file);
         if (ext === ".der" || ext === ".pem") {
-            const buf = await readCertificate(file);
-            results.push(buf);
+            const chain = await readCertificateChainAsync(file);
+            const concatenated = Buffer.concat(chain);
+            results.push(concatenated);
         } else if (ext === ".crl") {
             // Strict validation: only accept valid CRL files
             const buf = await readCertificateRevocationList(file);