Changeset 2038

Timestamp:

06/17/09 12:39:27 (9 months ago)

Author:

JensDiemer

Message:

changes to auto create user profile and fill JS-SHA salt+checksum from raw password: fix ticket:272

• Use signals instead of own UserAdmin?
• monkey patch User.set_password for getting the raw plaintext password.
• use django_tools.middlewares.ThreadLocal?.ThreadLocalMiddleware? to get the request object everywhere

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/admin.py (modified) (1 diff)
• apps/pylucid/models.py (modified) (3 diffs)
• settings.py (modified) (3 diffs)
• test.db3 (modified) (previous)

branches/0.9/pylucid_project/apps/pylucid/admin.py

@@ -122 +122 @@
 
 
-#------------------------------------------------------------------------------
-
-
-class PyLucidUserAdmin(UserAdmin):
-    """
-    extended version of User Model Admin class.
-    Add hooks for creating/deleting UserProfile model entries.
-    
-    We can use signals for this. But in singals handler, we get no request object.
-    Here we can give the request object into UserProfile methods for sending
-    feedback to the user and we need it for UpdateInfoBaseModel.
-    """
-    def log_addition(self, request, object):
-        """ called, after a new user created -> Create the UserProfile entry """
-        super(PyLucidUserAdmin, self).log_addition(request, object)
-        models.UserProfile.objects.create_user_profile(request, object)
-        
-    def log_deletion(self, request, object, object_repr):
-        """ called, after a user was deleted -> Delete the UserProfile entry """
-        super(PyLucidUserAdmin, self).log_deletion(request, object, object_repr)
-        models.UserProfile.objects.delete(request, object)
-        
-# Change the User Admin class with our externed version 
-admin.site.unregister([User])
-admin.site.register(User, PyLucidUserAdmin)
-
-
 class UserProfileAdmin(UpdateInfoBaseAdmin, VersionAdmin):
     list_display = ("user", "site_info", "lastupdatetime", "lastupdateby")

branches/0.9/pylucid_project/apps/pylucid/models.py

@@ -28 +28 @@
 from django.db import models
 from django.conf import settings
+from django.db.models import signals
 from django.core.urlresolvers import reverse
 from django.contrib.sites.models import Site
@@ -34 +35 @@
 from django.template.loader import render_to_string
 from django.contrib.sites.managers import CurrentSiteManager
+
+from django_tools.middlewares import ThreadLocal
+
+from pylucid_project.utils import crypt
 
 from pylucid.system.auto_model_info import UpdateInfoBaseModel, UpdateInfoBaseModelManager
@@ -563 +568 @@
 
 
-class UserProfileManager(UpdateInfoBaseModelManager):
-    def create_user_profile(self, request, user):
-        userprofile, created = self.get_or_create(request, user=user)
-        if created:
-            request.user.message_set.create(
-                message="UserProfile entry for user '%s' created." % user
-            )
-        
-        if not user.is_superuser:
-            # Info: superuser can automaticly access all sites
+
+
+    
+class UserProfile(UpdateInfoBaseModel):
+    """
+    Stores additional information about PyLucid users
+    http://docs.djangoproject.com/en/dev/topics/auth/#storing-additional-information-about-users
+    
+    Created via post_save signal, if a new user created.
+    """
+    user = models.ForeignKey(User, unique=True, related_name="%(class)s_user")
+    
+    sha_login_checksum = models.CharField(max_length=192,
+        help_text="Checksum for PyLucid JS-SHA-Login"
+    )
+    sha_login_salt = models.CharField(max_length=5,
+        help_text="Salt value for PyLucid JS-SHA-Login"
+    )
+    
+    site = models.ManyToManyField(Site,
+        help_text="User can access only these sites."
+    )
+    
+    def set_sha_login_password(self, request, raw_password):
+        """
+        create salt+checksum for JS-SHA-Login.
+        see also: http://www.pylucid.org/_goto/8/JS-SHA-Login/
+        """
+        raw_password = str(raw_password)
+        salt, sha_checksum = crypt.make_sha_checksum2(raw_password)
+        self.sha_login_salt = salt
+        self.sha_login_checksum = sha_checksum
+        request.user.message_set.create(
+            message="SHA Login salt+checksum created for user '%s'." % self.user
+        )
+
+    def __unicode__(self):
+        return u"UserProfile for user '%s'" % self.user.username
+
+    def site_info(self):
+        """ for pylucid.admin.UserProfileAdmin.list_display """
+        sites = self.site.all()
+        return ", ".join([site.name for site in sites])
+    
+    class Meta:
+        ordering = ("user",)
+
+
+#______________________________________________________________________________
+# Create user profile via signals
+
+def create_user_profile(sender, **kwargs):
+    """ signal handler: creating user profile, after a new user created. """
+    user = kwargs["instance"]
+    request = ThreadLocal.get_current_request()
+    
+    userprofile, created = UserProfile.objects.get_or_create(request, user=user)
+    if created:
+        request.user.message_set.create(message="UserProfile entry for user '%s' created." % user)
+    
+        if not user.is_superuser: # Info: superuser can automaticly access all sites
             site = Site.objects.get_current()
             userprofile.site.add(site)
             request.user.message_set.create(
                 message="Add site '%s' to '%s' UserProfile." % (site.name, user)
-            )
-            
-    def delete(self, request, user):
-        userprofile = self.get(user=user)
-        userprofile.delete()
-        request.user.message_set.create(
-            message="UserProfile entry from user '%s' deleted." % user
-        )
-
-    
-class UserProfile(UpdateInfoBaseModel):
-    """
-    Stores additional information about PyLucid users
-    http://docs.djangoproject.com/en/dev/topics/auth/#storing-additional-information-about-users
-    
-    We hacked into django.contrib.auth.admin.UserAdmin in pylucid/admin.py for
-    create/delete UserProfile entries.
-    """
-    objects = UserProfileManager()
-
-    user = models.ForeignKey(User, unique=True, related_name="%(class)s_user")
-    
-    sha_login_checksum = models.CharField(max_length=192,
-        help_text="Checksum for PyLucid JS-SHA-Login"
-    )
-    sha_login_salt = models.CharField(max_length=5,
-        help_text="Salt value for PyLucid JS-SHA-Login"
-    )
-    
-    site = models.ManyToManyField(Site,
-        help_text="User can access only these sites."
-    )
-
-    def __unicode__(self):
-        return u"UserProfile for user '%s'" % self.user.username
-
-    def site_info(self):
-        """ for pylucid.admin.UserProfileAdmin.list_display """
-        sites = self.site.all()
-        return ", ".join([site.name for site in sites])
-    
-    class Meta:
-        ordering = ("user",)
+            )            
+
+signals.post_save.connect(create_user_profile, sender=User)
+
+
+#______________________________________________________________________________
+"""
+We make a Monkey-Patch and change the method set_password() from
+the model class django.contrib.auth.models.User.
+We need the raw plaintext password, this is IMHO not available via signals.
+"""
+
+# Save the original method
+orig_set_password = User.set_password
+
+
+def set_password(user, raw_password):
+    #print "set_password() debug:", user, raw_password
+    if user.id == None:
+        # It is a new user. We must save the django user accound first to get a
+        # existing user object with a ID and then the JS-SHA-Login Data can assign to it.
+        user.save()
+
+    # Use the original method to set the django User password:
+    orig_set_password(user, raw_password)
+    
+    user_profile = user.get_profile()
+    request = ThreadLocal.get_current_request()
+
+    # Save the password for the JS-SHA-Login:
+    user_profile.set_sha_login_password(request, raw_password)
+    user_profile.save(request)
+
+
+# replace the method 
+User.set_password = set_password

branches/0.9/pylucid_project/settings.py

@@ -77 +77 @@
 
 MIDDLEWARE_CLASSES = (
+    'django_tools.middlewares.ThreadLocal.ThreadLocalMiddleware',
+    
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
@@ -86 +88 @@
     # slow down the django developer server
     # From http://code.google.com/p/django-tools/
-    #'django_tools.middlewares.SlowerDevServer.SlowerDevServerMiddleware',
+#    'django_tools.middlewares.SlowerDevServer.SlowerDevServerMiddleware',
 )
 SLOWER_DEV_SERVER_SLEEP = 0.3 # time.sleep() value (in sec.)
@@ -188 +190 @@
 # Do not use this in a production setting. Use this only for development.
 SERVE_STATIC_FILES = True
+#SERVE_STATIC_FILES = False
 
 # Note: Every URL/path...