Commit f80769d0 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #9948 -- Corrected URLField validation to match RFC1035 (URL... 

[1.0.X] Fixed #9948 -- Corrected URLField validation to match RFC1035 (URL analog of #9890). Thanks to kratorius for the report and fix.

Merge of r10574 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5f20587f

django/forms/fields.py

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ class ImageField(FileField): 


url_re = re.compile(

    r'^https?://' # http:// or https://

    r'(?:(?:[A-Z0-9-]+\.)+[A-Z]{2,6}|' #domain...

    r'(?:(?:[A-Z0-9]+(?:-*[A-Z0-9]+)*\.)+[A-Z]{2,6}|' #domain...

    r'localhost|' #localhost...

    r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip

    r'(?::\d+)?' # optional port

tests/regressiontests/forms/fields.py

+22 −0
Original line number Diff line number Diff line
@@ -900,6 +900,10 @@ u'http://example.com/' 
u'http://www.example.com/'

>>> f.clean('http://www.example.com:8000/test')

u'http://www.example.com:8000/test'

>>> f.clean('valid-with-hyphens.com')

u'http://valid-with-hyphens.com/'

>>> f.clean('subdomain.domain.com')

u'http://subdomain.domain.com/'

>>> f.clean('http://200.8.9.10')

u'http://200.8.9.10/'

>>> f.clean('http://200.8.9.10:8000/test')
@@ -924,6 +928,24 @@ ValidationError: [u'Enter a valid URL.'] 
Traceback (most recent call last):

...

ValidationError: [u'Enter a valid URL.']

>>> f.clean('http://invalid-.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid URL.']

>>> f.clean('http://-invalid.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid URL.']

>>> f.clean('http://inv-.alid-.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid URL.']

>>> f.clean('http://inv-.-alid.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid URL.']

>>> f.clean('http://valid-----hyphens.com')

u'http://valid-----hyphens.com/'



>>> f = URLField(required=False)

>>> f.clean('')