reduce email validation strictness (#6013)

* reduce email validation strictness * add unit test for exotic email validation
pypi · Jun 14, 2019 · 74bfb6b · 74bfb6b
1 parent bebd092
commit 74bfb6b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/tests/unit/accounts/test_forms.py b/tests/unit/accounts/test_forms.py
@@ -308,6 +308,18 @@ def test_invalid_email_error(self):
         assert not form.validate()
         assert form.email.errors.pop() == "The email address isn't valid. Try again."
 
+    def test_exotic_email_success(self):
+        form = forms.RegistrationForm(
+            data={"email": "foo@n--tree.net"},
+            user_service=pretend.stub(
+                find_userid_by_email=pretend.call_recorder(lambda _: None)
+            ),
+            breach_service=pretend.stub(check_password=lambda pw, tags=None: False),
+        )
+
+        form.validate()
+        assert len(form.email.errors) == 0
+
     def test_email_exists_error(self):
         form = forms.RegistrationForm(
             data={"email": "foo@bar.com"},

diff --git a/warehouse/accounts/forms.py b/warehouse/accounts/forms.py
@@ -147,8 +147,8 @@ class NewEmailMixin:
     email = wtforms.fields.html5.EmailField(
         validators=[
             wtforms.validators.DataRequired(),
-            wtforms.validators.Email(
-                message=("The email address isn't valid. Try again.")
+            wtforms.validators.Regexp(
+                r".+@.+\..+", message=("The email address isn't valid. Try again.")
             ),
         ]
     )