The Unified and Autonomous Development Platform
Fix issue #858 - Validate system email address to make sure it is well-formed in mail setting
Robin Shen5c112ba131d8
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.javaindex a2da1503e4..08910d0924 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;+import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;@@ -98,6 +99,7 @@ public class Office365Setting extends MailSetting {@Editable(order=410, description="Primary or alias email address of above account to be used as sender address "+ "of various notifications. Emails targeting this address will also be checked to post various "+ "comments if <code>Check Incoming Email</code> option is enabled below")@NotEmptypublic String getEmailAddress() {return emailAddress;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.javaindex c26888394f..44c9facd5a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.administration.mailsetting;+import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.mail.BasicAuthPassword;@@ -69,6 +70,7 @@ public class OtherMailSetting extends MailSetting {@Editable(order=410, description="This address will be used as sender address of various notifications. "+ "Emails targeting this address and its sub addressing in the IMAP inbox will also be checked if "+ "<code>Check Incoming Email</code> option is enabled below")@NotEmptypublic String getEmailAddress() {return emailAddress;