Ticket #131: remember-me-r3260.diff

acct_mgr/web_ui.py

@@ -11 +11 @@
-
-import random
-import string
+import time
-
-from trac import perm, util
-from trac.core import *
@@ -372 +373 @@
-            return 'login.html', data, None
-        return auth.LoginModule.process_request(self, req)
-
+        def _get_name_for_cookie(self, req, cookie):
+                name = auth.LoginModule._get_name_for_cookie(self, req, cookie)
+                if name and not req.incookie.has_key('trac_auth_session'):
+                        self.env.log.debug('Updating auth cookie %s for user %s' %
+                                                                (cookie.value, name))
+                        db = self.env.get_db_cnx()
+                        cursor = db.cursor()
+                        cursor.execute('UPDATE auth_cookie SET time=%s WHERE cookie=%s',
+                                                        (int(time.time()), cookie.value))
+                        req.outcookie['trac_auth'] = cookie.value
+                        req.outcookie['trac_auth']['path'] = self.env.href()
+                        req.outcookie['trac_auth']['expires'] = 86400 * 30
+                        req.outcookie['trac_auth_session'] = '1'
+                        req.outcookie['trac_auth_session']['path'] = self.env.href()
+                return name
+
-    def _do_login(self, req):
-        if not req.remote_user:
-            req.redirect(self.env.abs_href())
-
+
+
+
+
-
+        def _do_logout(self, req):
+                """Log the user out.
+                
+                Simply deletes the corresponding record from the auth_cookie table.
+                """
+                if req.authname == 'anonymous':
+                        # Not logged in
+                        return
+
+                # While deleting this cookie we also take the opportunity to delete
+                # cookies older than 30 days
+                db = self.env.get_db_cnx()
+                cursor = db.cursor()
+                cursor.execute("DELETE FROM auth_cookie WHERE name=%s OR time < %s",
+                                                (req.authname, int(time.time()) - 86400 * 30))
+                db.commit()
+                self._expire_cookie(req)
+
-    def _remote_user(self, req):
-        user = req.args.get('user')
-        password = req.args.get('password')

acct_mgr/templates/login.html

@@ -36 +36 @@
-          <label for="password">Password:</label>
-          <input type="password" id="password" name="password" class="textwidget" size="20" />
-        </div>
+        <div>
+          <input type="checkbox" id="rememberme" name="rememberme" value="1" />
+          <label for="rememberme">Remember me</label>
+        </div>
-        <input type="submit" value="Login" />
-
-        <p py:if="reset_password_enabled">