From b6ec5e108b4a2dba1a52c55d7369139a1953e886 Mon Sep 17 00:00:00 2001 From: Evil McJerkface Date: Thu, 19 Nov 2020 03:15:40 -0600 Subject: [PATCH] Added support for TLS & STARTTLS for SMTP connections. If port 465 is configured, TLS will be assumed. If port 587 is used, STARTTLS is assumed. (#478) Closes #353: Added support for TLS & STARTTLS for SMTP connections --- .../src/main/java/com/sismics/util/EmailUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs-core/src/main/java/com/sismics/util/EmailUtil.java b/docs-core/src/main/java/com/sismics/util/EmailUtil.java index 7448313f..c5bd38bc 100644 --- a/docs-core/src/main/java/com/sismics/util/EmailUtil.java +++ b/docs-core/src/main/java/com/sismics/util/EmailUtil.java @@ -99,11 +99,16 @@ public class EmailUtil { } // Port + int port = ConfigUtil.getConfigIntegerValue(ConfigType.SMTP_PORT); String envPort = System.getenv(Constants.SMTP_PORT_ENV); - if (envPort == null) { - email.setSmtpPort(ConfigUtil.getConfigIntegerValue(ConfigType.SMTP_PORT)); - } else { - email.setSmtpPort(Integer.valueOf(envPort)); + if (envPort != null) { + port = Integer.valueOf(envPort); + } + email.setSmtpPort(port); + if (port == 465) { + email.setSSLOnConnect(true); + } else if (port == 587) { + email.setStartTLSRequired(true); } // Username and password