Ticket #578: auto_admin_md5_fixed.diff

django/models/auth.py

@@ -29 +29 @@
     first_name = meta.CharField(maxlength=30, blank=True)
     last_name = meta.CharField(maxlength=30, blank=True)
     email = meta.EmailField('e-mail address', blank=True)
-    password_md5 = meta.CharField('password', maxlength=32, help_text="Use an MD5 hash -- not the raw password.")
+    password_md5 = meta.CharField('password', maxlength=32, help_text="Password will be automatically encrypted, and won't be visible once the user is added.")
     is_staff = meta.BooleanField('staff status', help_text="Designates whether the user can log into this admin site.")
     is_active = meta.BooleanField('active', default=True)
     is_superuser = meta.BooleanField('superuser status')
@@ -154 +154 @@
                     raise SiteProfileNotAvailable
         return self._profile_cache
 
-    def _module_create_user(username, email, password):
+    def _module_create_user(username, email, password_md5):
         "Creates and saves a User with the given username, e-mail and password."
-        import md5
-        password_md5 = md5.new(password).hexdigest()
         now = datetime.datetime.now()
         user = User(None, username, '', '', email.strip().lower(), password_md5, False, True, False, now, now)
-        user.save()
         return user
 
     def _module_make_random_password(length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'):
@@ -170 +167 @@
         from random import choice
         return ''.join([choice(allowed_chars) for i in range(length)])
 
+    def _pre_save(self):
+        import md5
+        if (self.password_md5 != md5.new(self.password_md5).hexdigest()):
+            self.password_md5 = md5.new(self.password_md5).hexdigest()
+
 class Message(meta.Model):
     user = meta.ForeignKey(User)
     message = meta.TextField()