Skip to content

The Unified and Autonomous Development Platform

Fix issue #832 - Onedev rejects valid email addresses with plus character

Robin Shen23bfdcc35fb8
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
index d016c0c781..8fffa4cc15 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.user.emailaddresses;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -18,7 +19,11 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.validation.validator.EmailAddressValidator;
+import org.apache.wicket.validation.IErrorMessageSource;
+import org.apache.wicket.validation.IValidatable;
+import org.apache.wicket.validation.IValidationError;
+import org.apache.wicket.validation.IValidator;
+import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.EmailAddressManager;
@@ -237,7 +242,24 @@ public class EmailAddressesPanel extends GenericPanel<User> {
});
input.setLabel(Model.of("Email address"));
input.setRequired(true);
- input.add(EmailAddressValidator.getInstance());
+ input.add(new IValidator<String>() {
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ String emailAddress = validatable.getValue();
+ if (!new EmailValidator().isValid(emailAddress, null)) {
+ validatable.error(new IValidationError() {
+
+ @Override
+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {
+ return "Malformed email address";
+ }
+
+ });
+ }
+ }
+
+ });
form.add(input);
add(new FencedFeedbackPanel("feedback", form));
add(form);