From ed7d9f4541df0a7995f8e7027e9c7a82687c771a Mon Sep 17 00:00:00 2001 From: "Hung-Han (Henry) Chen" Date: Tue, 2 Nov 2021 16:42:01 +0200 Subject: [PATCH] Comments Signed-off-by: Hung-Han (Henry) Chen --- src/common/system-ca.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/common/system-ca.ts b/src/common/system-ca.ts index d342b1f86d..dfead212ae 100644 --- a/src/common/system-ca.ts +++ b/src/common/system-ca.ts @@ -27,7 +27,7 @@ import { promiseExec } from "./utils/promise-exec"; // DST Root CA X3, which was expired on 9.30.2021 export const DSTRootCAX3 = "-----BEGIN CERTIFICATE-----\nMIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/\nMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\nDkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow\nPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD\nEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\nAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O\nrz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq\nOLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b\nxiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw\n7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD\naeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV\nHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG\nSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69\nikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr\nAvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz\nR8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5\nJDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo\nOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ\n-----END CERTIFICATE-----\n"; -export function isCertActive (cert: string) { +export function isCertActive(cert: string) { const isExpired = typeof cert !== "string" || cert.includes(DSTRootCAX3); return !isExpired; @@ -37,7 +37,7 @@ export function isCertActive (cert: string) { * Get root CA certificate from MacOSX system keychain * Only return non-expred certificates. */ -export async function getMacRootCA () { +export async function getMacRootCA() { // inspired mac-ca https://github.com/jfromaniello/mac-ca const args = "find-certificate -a -p"; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Cheatsheet#other_assertions @@ -54,7 +54,7 @@ export async function getMacRootCA () { * Get root CA certificate from Windows system certificate store. * Only return non-expred certificates. */ -export function getWinRootCA (): Promise { +export function getWinRootCA(): Promise { return new Promise((resolve) => { const CAs: string[] = []; @@ -75,20 +75,17 @@ export function getWinRootCA (): Promise { /** * Add (or merge) CAs to https.globalAgent.options.ca */ -export function injectCAs (CAs: string[]) { - for (const cert of CAs) { - if (Array.isArray(https.globalAgent.options.ca) && !https.globalAgent.options.ca.includes(cert)) { - https.globalAgent.options.ca.push(cert); - } else { - https.globalAgent.options.ca = [cert]; - } - } +export function injectCAs(CAs: string[]) { + const oldCAs = [https.globalAgent.options.ca].flat(); + const injectedCAs = new Set([...oldCAs, ...CAs]); + + https.globalAgent.options.ca = [...injectedCAs]; } /** * Inject CAs found in OS's (Windoes/MacOSX only) root certificate store to https.globalAgent.options.ca */ -export async function injectSystemCAs () { +export async function injectSystemCAs() { if (isMac) { try { const osxRootCAs = await getMacRootCA();