Ticket #12027: 12027.diff

django/core/validators.py

@@ -114 +114 @@
         if not self.user_regex.match(user_part):
             raise ValidationError(self.message, code=self.code)
 
-        if (not domain_part in self.domain_whitelist and
-                not self.domain_regex.match(domain_part)):
+        def domain_is_invalid(domain):
+            return not self.domain_regex.match(domain_part) or domain_part.endswith('.')
+
+        if domain_part not in self.domain_whitelist and domain_is_invalid(domain_part):
             # Try for possible IDN domain-part
             try:
                 domain_part = domain_part.encode('idna').decode('ascii')
-                if not self.domain_regex.match(domain_part):
+                if domain_is_invalid(domain_part):
                     raise ValidationError(self.message, code=self.code)
                 else:
                     return

tests/validators/tests.py

@@ -56 +56 @@
     # Quoted-string format (CR not allowed)
     (validate_email, '"\\\011"@here.com', None),
     (validate_email, '"\\\012"@here.com', ValidationError),
+    (validate_email, 'trailingdot@shouldfail.com.', ValidationError),
 
     (validate_slug, 'slug-ok', None),
     (validate_slug, 'longer-slug-still-ok', None),