Ticket #17320: 17320.diff

django/contrib/sites/models.py

@@ -1 +1 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError
 
 
 SITE_CACHE = {}
@@ -61 +62 @@
         except KeyError:
             pass
 
+    def clean(self):
+        if ' ' in self.domain:
+            raise ValidationError('Domain name cannot contain any whitespace.')
+
+
 
 class RequestSite(object):
     """

django/contrib/sites/tests.py

@@ -1 +1 @@
 from django.conf import settings
 from django.contrib.sites.models import Site, RequestSite, get_current_site
 from django.contrib.sites.middleware import SiteMiddleware
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.http import HttpRequest
 from django.test import TestCase
 
@@ -56 +56 @@
         self.assertTrue(isinstance(site, RequestSite))
         self.assertEqual(site.name, u"example.com")
 
+    def test_domain_cannot_contain_whitespace(self):
+        site = Site.objects.get_current()
+        site.domain = 'domain contains\twhitespaces\n'
+        self.assertRaises(ValidationError, site.full_clean)
+
 class MiddlewareTest(TestCase):
 
     def test_request(self):