Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixes #13804 -- URLField validation failure for a url containing '://…

…' on the path and no scheme

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b8a78804b50b9f14030ab1c7c43816672c08242c 1 parent f6ead36
@SmileyChris SmileyChris authored
View
17 django/forms/fields.py
@@ -581,14 +581,23 @@ def __init__(self, max_length=None, min_length=None, verify_exists=False,
def to_python(self, value):
if value:
- if '://' not in value:
- # If no URL scheme given, assume http://
- value = u'http://%s' % value
url_fields = list(urlparse.urlsplit(value))
+ if not url_fields[0]:
+ # If no URL scheme given, assume http://
+ url_fields[0] = 'http'
+ if not url_fields[1]:
+ # Assume that if no domain is provided, that the path segment
+ # contains the domain.
+ url_fields[1] = url_fields[2]
+ url_fields[2] = ''
+ # Rebuild the url_fields list, since the domain segment may now
+ # contain the path too.
+ value = urlparse.urlunsplit(url_fields)
+ url_fields = list(urlparse.urlsplit(value))
if not url_fields[2]:
# the path portion may need to be added before query params
url_fields[2] = '/'
- value = urlparse.urlunsplit(url_fields)
+ value = urlparse.urlunsplit(url_fields)
return super(URLField, self).to_python(value)
class BooleanField(Field):
View
1  tests/regressiontests/forms/tests/fields.py
@@ -495,6 +495,7 @@ def test_urlfield_1(self):
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://inv-.-alid.com')
self.assertEqual(u'http://valid-----hyphens.com/', f.clean('http://valid-----hyphens.com'))
self.assertEqual(u'http://some.idn.xyz\xe4\xf6\xfc\xdfabc.domain.com:123/blah', f.clean('http://some.idn.xyzäöüßabc.domain.com:123/blah'))
+ self.assertEqual(u'http://www.example.com/s/http://code.djangoproject.com/ticket/13804', f.clean('www.example.com/s/http://code.djangoproject.com/ticket/13804'))
def test_url_regex_ticket11198(self):
f = URLField()

0 comments on commit b8a7880

Please sign in to comment.
Something went wrong with that request. Please try again.