Ticket #1234: last_login_clear_pass.diff

contrib/admin/views/decorators.py

@@ -4 +4 @@
 from django.utils import httpwrappers
 import base64, md5
 import cPickle as pickle
+import datetime
 
 ERROR_MESSAGE = "Please enter a correct username and password. Note that both fields are case-sensitive."
 LOGIN_FORM_KEY = 'this_is_the_login_form'
@@ -46 +47 @@
     def _checklogin(request, *args, **kwargs):
         if not request.user.is_anonymous() and request.user.is_staff:
             # The user is valid. Continue to the admin page.
+            if request.POST.has_key('post_data'):
+                # we must have re-authenticated through a different window or tab
+                request.POST = _decode_post_data(request.POST['post_data'])
             return view_func(request, *args, **kwargs)
 
         assert hasattr(request, 'session'), "The Django admin requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.middleware.sessions.SessionMiddleware'."
@@ -83 +87 @@
         else:
             if user.check_password(request.POST.get('password', '')):
                 request.session[users.SESSION_KEY] = user.id
+                # keep track of last login
+                user.last_login = datetime.datetime.now()
+                user.save()
                 if request.POST.has_key('post_data'):
                     post_data = _decode_post_data(request.POST['post_data'])
                     if post_data and not post_data.has_key(LOGIN_FORM_KEY):