Ticket #17046: validate_user_save.diff

django/contrib/auth/models.py

@@ -15 +15 @@
     check_password, make_password, is_password_usable, UNUSABLE_PASSWORD)
 from django.contrib.auth.signals import user_logged_in
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ValidationError
 
 
 def update_last_login(sender, user, **kwargs):
@@ -284 +285 @@
     def has_usable_password(self):
         return is_password_usable(self.password)
 
+    # The save method is overriden to raise an error when the username is blank.
+    # See ticket #17046
+    def save(self, *args, **kwargs):
+        if self.username == '':
+            raise ValidationError(_('username cannot be an empty string.'))
+        super(User, self).save(*args, **kwargs)
+
     def get_group_permissions(self, obj=None):
         """
         Returns a list of permission strings that this user has through his/her

django/contrib/auth/tests/__init__.py

@@ -10 +10 @@
 from django.contrib.auth.tests.remote_user import (RemoteUserTest,
     RemoteUserNoCreateTest, RemoteUserCustomTest)
 from django.contrib.auth.tests.management import GetDefaultUsernameTestCase
-from django.contrib.auth.tests.models import ProfileTestCase
+from django.contrib.auth.tests.models import ProfileTestCase, UserEmptyUsernameCase
 from django.contrib.auth.tests.hashers import TestUtilsHashPass
 from django.contrib.auth.tests.signals import SignalTestCase
 from django.contrib.auth.tests.tokens import TokenGeneratorTest

django/contrib/auth/tests/models.py

@@ -1 +1 @@
 from django.conf import settings
 from django.test import TestCase
 from django.contrib.auth.models import User, SiteProfileNotAvailable
+from django.core.exceptions import ValidationError
 
 class ProfileTestCase(TestCase):
     fixtures = ['authtestdata.json']
@@ -33 +34 @@
         # module that doesn't exist
         settings.AUTH_PROFILE_MODULE = 'foo.bar'
         self.assertRaises(SiteProfileNotAvailable, user.get_profile)
+
+
+class UserEmptyUsernameCase(TestCase):
+    
+    def test_empty_username(self):
+        with self.assertRaises(ValidationError):
+            User.objects.create_user(username='', password='password', email='e@e.com')