Merge f65453e50c into 6899603eb7

fix #5314 Email Address Friendly Name Error (#5318 )
fix: correct linter errors
2025-02-17 09:05:56 +00:00 · 2024-11-09 15:30:21 +00:00 · 2024-11-09 23:30:08 +08:00 · 2024-09-21 18:22:37 -04:00 · 2024-09-21 18:01:42 -04:00
2 changed files with 36 additions and 13 deletions
--- 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 {
--- a/src/components/notifications/SendGrid.vue
+++ b/src/components/notifications/SendGrid.vue
@ -5,20 +5,20 @@
    </div>
    <div class="mb-3">
        <label for="sendgrid-from-email" class="form-label">{{ $t("From Email") }}</label>
-        <input id="sendgrid-from-email" v-model="$parent.notification.sendgridFromEmail" type="email" class="form-control" required>
+        <input id="sendgrid-from-email" v-model="$parent.notification.sendgridFromEmail" type="text" class="form-control" required>
    </div>
    <div class="mb-3">
        <label for="sendgrid-to-email" class="form-label">{{ $t("To Email") }}</label>
-        <input id="sendgrid-to-email" v-model="$parent.notification.sendgridToEmail" type="email" class="form-control" required>
+        <input id="sendgrid-to-email" v-model="$parent.notification.sendgridToEmail" type="text" class="form-control" required>
    </div>
    <div class="mb-3">
        <label for="sendgrid-cc-email" class="form-label">{{ $t("smtpCC") }}</label>
-        <input id="sendgrid-cc-email" v-model="$parent.notification.sendgridCcEmail" type="email" class="form-control">
+        <input id="sendgrid-cc-email" v-model="$parent.notification.sendgridCcEmail" type="text" class="form-control">
        <div class="form-text">{{ $t("Separate multiple email addresses with commas") }}</div>
    </div>
    <div class="mb-3">
        <label for="sendgrid-bcc-email" class="form-label">{{ $t("smtpBCC") }}</label>
-        <input id="sendgrid-bcc-email" v-model="$parent.notification.sendgridBccEmail" type="email" class="form-control">
+        <input id="sendgrid-bcc-email" v-model="$parent.notification.sendgridBccEmail" type="text" class="form-control">
        <small class="form-text text-muted">{{ $t("Separate multiple email addresses with commas") }}</small>
    </div>
    <div class="mb-3">
Author	SHA1	Message	Date
Patrick Wagstrom	34bad4111c	Merge `f65453e50c` into `6899603eb7`	2024-11-09 15:30:21 +00:00
Abhigyan Mohanta	6899603eb7	fix #5314 Email Address Friendly Name Error (#5318 ) Some checks failed CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / check-linters (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details	2024-11-09 23:30:08 +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