diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-07-20 18:00:23 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-07-21 21:12:50 +0200 |
| commit | 48516d3b853e99600c60fed26b5c12ed3fc4a4d8 (patch) | |
| tree | b176ccfafa4110e2d3082fe328f6c38de73a477c | |
| parent | 706e542eb5db0d14277f34566d351b875e645bac (diff) | |
[1.6.x] Fixed an email validation regression
Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad from master.
| -rw-r--r-- | django/core/validators.py | 2 | ||||
| -rw-r--r-- | tests/validators/tests.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/core/validators.py b/django/core/validators.py index 200d28fe02..aa417ed099 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -87,7 +87,7 @@ class EmailValidator(object): r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"$)', # quoted-string re.IGNORECASE) domain_regex = re.compile( - r'(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?$)' # domain + r'(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}|[A-Z0-9-]{2,})\.?$' # domain # literal form, ipv4 address (SMTP 4.1.3) r'|^\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$', re.IGNORECASE) diff --git a/tests/validators/tests.py b/tests/validators/tests.py index a1555d8e91..8d21ddea79 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -46,6 +46,7 @@ TEST_DATA = ( (validate_email, 'example@-invalid.com', ValidationError), (validate_email, 'example@inv-.alid-.com', ValidationError), (validate_email, 'example@inv-.-alid.com', ValidationError), + (validate_email, 'test@example.com\n\n<script src="x.js">', ValidationError), # Quoted-string format (CR not allowed) (validate_email, '"\\\011"@here.com', None), (validate_email, '"\\\012"@here.com', ValidationError), |