Correctly use start TLS for emails

filiphr · Jan 2, 2024 · 7c75794 · 7c75794
1 parent abee49a
commit 7c75794
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/...ble-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java b/...ble-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java
@@ -21,6 +21,7 @@ public class BaseMailHostServerConfiguration implements MailHostServerConfigurat
 
     protected int port = 25;
     protected Transport transport = Transport.SMTP;
+    protected boolean startTlsEnabled;
 
     protected String user;
     protected String password;
@@ -52,6 +53,15 @@ public void setTransport(Transport transport) {
         this.transport = transport;
     }
 
+    @Override
+    public boolean isStartTlsEnabled() {
+        return startTlsEnabled;
+    }
+
+    public void setStartTlsEnabled(boolean startTlsEnabled) {
+        this.startTlsEnabled = startTlsEnabled;
+    }
+
     @Override
     public String user() {
         return user;

diff --git a/...lowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java b/...lowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java
@@ -27,10 +27,11 @@ public non-sealed interface MailHostServerConfiguration extends MailServerConfig
 
     String password();
 
+    boolean isStartTlsEnabled();
+
     enum Transport {
         SMTP,
         SMTPS,
-        SMTPS_TLS,
     }
 
 }
diff --git a/...c/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java b/...c/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java
@@ -379,7 +379,7 @@ protected Session createSession(MailHostServerConfiguration serverConfiguration)
         properties.setProperty(MAIL_HOST, host);
 
         MailHostServerConfiguration.Transport transport = serverConfiguration.transport();
-        properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE, transport == MailHostServerConfiguration.Transport.SMTPS_TLS ? "true" : "false");
+        properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE, Boolean.toString(serverConfiguration.isStartTlsEnabled()));
         properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED, "false");
 
         properties.setProperty(MAIL_SMTP_SEND_PARTIAL, "false");
@@ -390,7 +390,7 @@ protected Session createSession(MailHostServerConfiguration serverConfiguration)
             properties.setProperty(MAIL_SMTP_AUTH, "true");
         }
 
-        if (transport == MailHostServerConfiguration.Transport.SMTPS || transport == MailHostServerConfiguration.Transport.SMTPS_TLS) {
+        if (transport == MailHostServerConfiguration.Transport.SMTPS) {
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_PORT, String.valueOf(serverConfiguration.port()));
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_CLASS, "javax.net.ssl.SSLSocketFactory");
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_FALLBACK, "false");