Merge f65453e50c into be2faf64ce

Clarify that BSD OSs are not supported (#5465 )
Clarify that BSD OSs are not supported
2025-03-13 04:44:46 +00:00 · 2024-12-22 05:46:24 +00:00 · 2024-12-22 13:46:13 +08:00 · 2024-12-22 13:45:19 +08:00 · 2024-09-21 18:22:37 -04:00 · 2024-09-21 18:01:42 -04:00
2 changed files with 33 additions and 9 deletions
--- a/README.md
+++ b/README.md
@ -62,6 +62,7 @@ Requirements:
 - Platform
  - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
  - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
+  - ❌ FreeBSD / OpenBSD / NetBSD
  - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 18 / 20.4
 - [npm](https://docs.npmjs.com/cli/) 9
--- a/server/docker.js
+++ b/server/docker.js
@ -156,15 +156,38 @@ class DockerHost {
        let certPath = path.join(Database.dockerTLSDir, dirName, DockerHost.CertificateFileNameCert);
        let keyPath = path.join(Database.dockerTLSDir, dirName, DockerHost.CertificateFileNameKey);

-        if (dockerType === "tcp" && fs.existsSync(caPath) && fs.existsSync(certPath) && fs.existsSync(keyPath)) {
-            let ca = fs.readFileSync(caPath);
-            let key = fs.readFileSync(keyPath);
-            let cert = fs.readFileSync(certPath);
-            certOptions = {
-                ca,
-                key,
-                cert
-            };
+        let key;
+        let cert;
+        let ca;
+
+        if (dockerType === "tcp") {
+            if (fs.existsSync(keyPath) && fs.existsSync(certPath)) {
+                // Load the key and cert
+                key = fs.readFileSync(keyPath);
+                cert = fs.readFileSync(certPath);
+
+                if (fs.existsSync(caPath)) {
+                    // Condition 1: Mutual TLS with self-signed certificate
+                    ca = fs.readFileSync(caPath);
+                    certOptions = {
+                        ca,
+                        key,
+                        cert
+                    };
+                } else {
+                    // Condition 2: Mutual TLS with certificate in the standard trust store
+                    certOptions = {
+                        key,
+                        cert
+                    };
+                }
+            } else if (fs.existsSync(caPath)) {
+                // Condition 3: TLS using self-signed certificate (without mutual TLS)
+                ca = fs.readFileSync(caPath);
+                certOptions = {
+                    ca
+                };
+            }
        }

        return {
Author	SHA1	Message	Date
Patrick Wagstrom	a86edc89ae	Merge `f65453e50c` into `be2faf64ce`	2024-12-22 05:46:24 +00:00
Louis Lam	be2faf64ce	Clarify that BSD OSs are not supported (#5465 ) Some checks failed validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details	2024-12-22 13:46:13 +08:00
Louis Lam	0b76e19401	Clarify that BSD OSs are not supported	2024-12-22 13:45:19 +08:00
Patrick Wagstrom	f65453e50c	fix: correct linter errors I missed some of the `let` definitions for the ca, cert, and key when establishing the docker TLS connection. DCO-1.1 Signed-off-by: Patrick Wagstrom <160672+pridkett@users.noreply.github.com>	2024-09-21 18:22:37 -04:00
Patrick Wagstrom	495bf51ac8	fix: allow TLS with remote docker when using public CA This provides a small fix that allows you to define docker hosts that you can connect with in three different ways: 1. Mutual TLS, docker host uses non-standard CA 2. Mutual TLS, docker host uses standard CA 3. No Authentication, docker host uses non-standard CA 4. No authentication, docker host uses standard CA In the previous implementation only condition 1 and 4 were allowed. This makes condition 2 and 3 possible. The logic is a little messy, but it works. DCO-1.1 Signed-off-by: Patrick Wagstrom <160672+pridkett@users.noreply.github.com>	2024-09-21 18:01:42 -04:00