The Unified and Autonomous Development Platform
Fix issue #1214 - Do not open issue via email if subject starts with RE:
Robin Shen29f00409a6d0
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.javaindex b590c85e19..0d440c3de3 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java@@ -723,10 +723,15 @@ public class DefaultMailManager implements MailManager, Serializable {ParsedEmailAddress parsedSystemAddress) throws MessagingException, IOException {Issue issue = new Issue();issue.setProject(project);- if (StringUtils.isNotBlank(message.getSubject()))+ if (StringUtils.isNotBlank(message.getSubject())) {+ if (message.getSubject().trim().toLowerCase().startsWith("re:")) {+ throw new ExplicitException("This address is intended to open issues, " ++ "however the message looks like a reply to some other email");+ }issue.setTitle(message.getSubject());- else- issue.setTitle("No title");+ } else {+ throw new ExplicitException("Subject required to open issue via email");+ }String messageId = getMessageId(message);if (messageId != null)@@ -882,7 +887,8 @@ public class DefaultMailManager implements MailManager, Serializable {}@Override- public Future<?> monitorInbox(MailCheckSetting checkSetting, MessageListener listener, MailPosition lastPosition) {+ public Future<?> monitorInbox(MailCheckSetting checkSetting, MessageListener listener,+ MailPosition lastPosition) {return executorService.submit(new Runnable() {private void processMessages(IMAPFolder inbox, AtomicInteger messageNumber) throws MessagingException {@@ -895,6 +901,28 @@ public class DefaultMailManager implements MailManager, Serializable {try {listener.onReceived(message);} catch (Exception e) {+ try {+ String[] fromHeader = message.getHeader("From");+ if (fromHeader != null && fromHeader.length != 0) {+ InternetAddress from = InternetAddress.parse(fromHeader[0], true)[0];+ String textBody, htmlBody;+ if (e.getMessage() != null) {+ textBody = e.getMessage() ++ "\n\nContact site administrator if necessary";+ htmlBody = HtmlEscape.escapeHtml5(e.getMessage()) ++ "<br><br>Contact site administrator if necessary";+ } else {+ textBody = "Please contact site administrator";+ htmlBody = "Please contact site administrator";+ }++ sendMailAsync(Lists.newArrayList(from.getAddress()), new ArrayList<>(),+ new ArrayList<>(), "OneDev is unable to process your message",+ htmlBody, textBody, null, null, null);+ }+ } catch (Exception e2) {+ logger.error("Error sending mail", e);+ }logger.error("Error processing message", e);}}diff --git a/server-core/src/main/java/io/onedev/server/mail/MailManager.java b/server-core/src/main/java/io/onedev/server/mail/MailManager.javaindex 87c68e74dd..baea02d833 100644--- a/server-core/src/main/java/io/onedev/server/mail/MailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/MailManager.java@@ -1,13 +1,12 @@package io.onedev.server.mail;-import java.util.Collection;-import java.util.concurrent.Future;--import javax.annotation.Nullable;-import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;+import javax.annotation.Nullable;+import java.util.Collection;+import java.util.concurrent.Future;+public interface MailManager {public static final String TEST_SUB_ADDRESS = "test~subaddressing";@@ -42,6 +41,6 @@ public interface MailManager {String toPlainText(String mailContent);- Future<?> monitorInbox(MailCheckSetting mailCheckSetting, MessageListener listener, MailPosition MailPosition);+ Future<?> monitorInbox(MailCheckSetting checkSetting, MessageListener listener, MailPosition MailPosition);}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.javaindex 6c9f55be9f..3dc80bcff0 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@@ -1,27 +1,7 @@package io.onedev.server.web.page.admin.mailsetting;-import java.util.UUID;-import java.util.concurrent.Callable;-import java.util.concurrent.CancellationException;-import java.util.concurrent.ExecutionException;-import java.util.concurrent.Future;-import java.util.concurrent.atomic.AtomicReference;--import javax.mail.Message;-import javax.mail.MessagingException;--import org.apache.wicket.Component;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Button;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;@@ -39,6 +19,23 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.page.admin.AdministrationPage;+import org.apache.wicket.Component;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Button;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;++import javax.mail.Message;+import javax.mail.MessagingException;+import java.util.UUID;+import java.util.concurrent.Callable;+import java.util.concurrent.CancellationException;+import java.util.concurrent.ExecutionException;+import java.util.concurrent.Future;+import java.util.concurrent.atomic.AtomicReference;@SuppressWarnings("serial")public class MailSettingPage extends AdministrationPage {