to: adding try-catch during loading certs, prevent error

TabbyML · Oct 10, 2024 · d3e4973 · d3e4973
1 parent f57068c
commit d3e4973
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/clients/tabby-agent/src/certsLoader.ts b/clients/tabby-agent/src/certsLoader.ts
@@ -56,26 +56,34 @@ async function loadFromFiles(files: string) {
 }
 
 async function loadTlsCaCerts(config: ConfigData["tls"]) {
-  if (config.caCerts === "bundled") {
-    return;
-  } else if (config.caCerts === "system") {
-    if (process.platform === "win32") {
-      logger.debug(`Loading extra certs from win-ca.`);
-      winCa.exe(path.join("win-ca", "roots.exe"));
-      winCa({
-        fallback: true,
-        inject: "+",
-      });
-    } else if (process.platform === "darwin") {
-      logger.debug(`Loading extra certs from mac-ca.`);
-      const certs = macCa.get();
-      appendCaCerts(certs);
+  try {
+    if (config.caCerts === "bundled") {
+      return;
+    } else if (config.caCerts === "system") {
+      if (process.platform === "win32") {
+        logger.debug(`Loading extra certs from win-ca.`);
+        winCa.exe(path.join("win-ca", "roots.exe"));
+        winCa({
+          fallback: true,
+          inject: "+",
+        });
+      } else if (process.platform === "darwin") {
+        logger.debug(`Loading extra certs from mac-ca.`);
+        const certs = macCa.get();
+        appendCaCerts(certs);
+      } else {
+        // linux: load from openssl cert
+        await loadFromFiles(path.join("/etc/ssl/certs/ca-certificates.crt"));
+      }
+    } else if (config.caCerts) {
+      await loadFromFiles(config.caCerts);
+    }
+  } catch (err) {
+    if (err instanceof Error) {
+      logger.warn(`Error loading TLS CA certificates: ${err.message}`);
     } else {
-      // linux: load from openssl cert
-      await loadFromFiles(path.join("/etc/ssl/certs/ca-certificates.crt"));
+      logger.warn(`Unexpected error loading TLS CA certificates: ${String(err)}`);
     }
-  } else if (config.caCerts) {
-    await loadFromFiles(config.caCerts);
   }
 }