Add option to explicitly specify the use of STARTTLS

Required for servers that use STARTTLS without SMTPS such as Office 365

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 3215094e110e555e768cb3cc4ef9b810aaea1674..fd30b6d7024013b67ef5874fe80c2c25e0222ca3 100644 (file)
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -1410,6 +1410,11 @@ mail.debug = false
 # use SMTPs flag\r
 mail.smtps = false\r
 \r
+# use STARTTLS flag\r
+#\r
+# SINCE 1.6.0\r
+mail.starttls = false\r
+\r
 # if your smtp server requires authentication, supply the credentials here\r
 #\r
 # SINCE 0.6.0\r

diff --git a/src/main/java/com/gitblit/service/MailService.java b/src/main/java/com/gitblit/service/MailService.java
index 4759d177f864925cbcc54228cae5a1b741159862..ae9727fc64c297ce957cf8f0ab89df050f056f8f 100644 (file)
--- a/src/main/java/com/gitblit/service/MailService.java
+++ b/src/main/java/com/gitblit/service/MailService.java
@@ -68,6 +68,7 @@ public class MailService implements Runnable {
                final String mailUser = settings.getString(Keys.mail.username, null);\r
                final String mailPassword = settings.getString(Keys.mail.password, null);\r
                final boolean smtps = settings.getBoolean(Keys.mail.smtps, false);\r
+               final boolean starttls = settings.getBoolean(Keys.mail.starttls, false);\r
                boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword);\r
                String server = settings.getString(Keys.mail.server, "");\r
                if (StringUtils.isEmpty(server)) {\r
@@ -86,6 +87,7 @@ public class MailService implements Runnable {
                props.setProperty("mail.smtp.port", String.valueOf(port));\r
                props.setProperty("mail.smtp.auth", String.valueOf(authenticate));\r
                props.setProperty("mail.smtp.auths", String.valueOf(authenticate));\r
+               props.setProperty("mail.smtp.starttls.enable", String.valueOf(starttls));\r
 \r
                if (isGMail || smtps) {\r
                        props.setProperty("mail.smtp.starttls.enable", "true");\r