Skip to content

The Unified and Autonomous Development Platform

Separate IMAP SSL from SMTP StartTLS

Robin Shen0f319eaba099
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 06a95ed791..cdf36db80d 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3053,6 +3053,21 @@ public class DataMigrator {
if (lastCodeCommentActivityDateElement != null)
lastCodeCommentActivityDateElement.detach();
}
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("MAIL")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ String enableStartTLSElement = valueElement.elementTextTrim("enableStartTLS");
+ Element receiveMailSettingElement = valueElement.element("receiveMailSetting");
+ if (receiveMailSettingElement != null)
+ receiveMailSettingElement.addElement("enableSSL").setText(enableStartTLSElement);
+ }
+ }
+ }
+ dom.writeToFile(file, false);
}
}
for (File file: dataDir.listFiles()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
index bcee129998..e9d9c3ff08 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
@@ -84,6 +84,16 @@ public class MailSetting implements Serializable {
this.emailAddress = emailAddress;
}
+ @Editable(order=430, name="Enable SMTP StartTLS", description="Whether or not to enable StartTLS "
+ + "when connect to SMTP server")
+ public boolean isEnableStartTLS() {
+ return enableStartTLS;
+ }
+
+ public void setEnableStartTLS(boolean enableStartTLS) {
+ this.enableStartTLS = enableStartTLS;
+ }
+
@Editable(order=450, name="Check Incoming Email", description="Enable this to post issue and pull request comments via email<br>"
+ "<b class='text-danger'>NOTE:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> "
+ "needs to be enabled for system email address, as OneDev uses it to track issue and pull request contexts")
@@ -95,16 +105,6 @@ public class MailSetting implements Serializable {
this.receiveMailSetting = receiveMailSetting;
}
- @Editable(order=550, name="Enable SSL/TLS", description="Whether or not to enable SSL/TLS "
- + "when interacting with mail server")
- public boolean isEnableStartTLS() {
- return enableStartTLS;
- }
-
- public void setEnableStartTLS(boolean enableStartTLS) {
- this.enableStartTLS = enableStartTLS;
- }
-
@Editable(order=600, description="Specify timeout in seconds when communicating with mail server")
@Min(value=10, message="This value should not be less than 10")
public int getTimeout() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java
index 267ceb6a82..6fe2300291 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java
@@ -20,6 +20,8 @@ public class ReceiveMailSetting implements Serializable {
private String imapPassword;
+ private boolean enableSSL = true;
+
@Editable(order=100, name="IMAP Host")
@NotEmpty
public String getImapHost() {
@@ -61,5 +63,14 @@ public class ReceiveMailSetting implements Serializable {
public void setImapPassword(String imapPassword) {
this.imapPassword = imapPassword;
}
+
+ @Editable(order=700, name="Enable IMAP SSL", description="Whether or not to enable SSL when connect to IMAP server")
+ public boolean isEnableSSL() {
+ return enableSSL;
+ }
+
+ public void setEnableSSL(boolean enableSSL) {
+ this.enableSSL = enableSSL;
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index ca27662f20..719342460e 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -701,8 +701,8 @@ public class DefaultMailManager implements MailManager {
try {
MailSetting mailSetting = settingManager.getMailSetting();
if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {
- Future<?> future = monitorInbox(mailSetting.getReceiveMailSetting(), mailSetting.isEnableStartTLS(),
- mailSetting.getTimeout(), new MessageListener() {
+ Future<?> future = monitorInbox(mailSetting.getReceiveMailSetting(), mailSetting.getTimeout(),
+ new MessageListener() {
@Override
public void onReceived(Message message) {
@@ -754,8 +754,7 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public Future<?> monitorInbox(ReceiveMailSetting receiveMailSetting, boolean enableStartTLS,
- int timeout, MessageListener listener) {
+ public Future<?> monitorInbox(ReceiveMailSetting receiveMailSetting, int timeout, MessageListener listener) {
return executorService.submit(new Runnable() {
@Override
@@ -764,7 +763,7 @@ public class DefaultMailManager implements MailManager {
properties.setProperty("mail.imap.host", receiveMailSetting.getImapHost());
properties.setProperty("mail.imap.port", String.valueOf(receiveMailSetting.getImapPort()));
- properties.setProperty("mail.imap.ssl.enable", String.valueOf(enableStartTLS));
+ properties.setProperty("mail.imap.ssl.enable", String.valueOf(receiveMailSetting.isEnableSSL()));
properties.setProperty("mail.imap.socketFactory.fallback", "false");
properties.setProperty("mail.imap.socketFactory.port", String.valueOf(receiveMailSetting.getImapPort()));
diff --git a/server-core/src/main/java/io/onedev/server/notification/MailManager.java b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
index 76d8886315..f9a7ed89c5 100644
--- a/server-core/src/main/java/io/onedev/server/notification/MailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
@@ -38,7 +38,6 @@ public interface MailManager {
@Nullable
public String getUnsubscribeAddress(PullRequest request);
- Future<?> monitorInbox(ReceiveMailSetting receiveMailSetting, boolean enableStartTLS,
- int timeout, MessageListener listener);
+ Future<?> monitorInbox(ReceiveMailSetting receiveMailSetting, int timeout, MessageListener listener);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index b73ac39cbe..a017a093ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -122,7 +122,7 @@ public class MailSettingPage extends AdministrationPage {
};
futureRef.set(mailManager.monitorInbox(mailSetting.getReceiveMailSetting(),
- mailSetting.isEnableStartTLS(), mailSetting.getTimeout(), listener));
+ mailSetting.getTimeout(), listener));
EmailAddress emailAddress = EmailAddress.parse(mailSetting.getEmailAddress());
String subAddressed = emailAddress.getPrefix() + "+"