fix: before starttls check if connection is secure (#57)

EC-Nordbund · Nov 29, 2022 · e0c35d3 · e0c35d3
1 parent 4501d4c
commit e0c35d3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/client/basic/client.ts b/client/basic/client.ts
@@ -326,7 +326,12 @@ export class SMTPClient {
     }
 
     if (
-      this.#supportedFeatures.has("STARTTLS") && !this.config.debug.noStartTLS
+      // When in TLS don't use STARTTLS
+      !this.secure &&
+      // Check for STARTTLS support
+      this.#supportedFeatures.has("STARTTLS") &&
+      // Check that STARTTLS is allowed
+      !this.config.debug.noStartTLS
     ) {
       this.#connection.writeCmdAndAssert(CommandCode.READY, "STARTTLS");