LocalTracChanges: acct_mgr_plugin_ssl_remember_me_rev_4111.patch

acct_mgr/web_ui.py

@@ -13 +13 @@
 import os
 import random
 import string
+
+
+
 
 from trac import perm, util
 from trac.core import *
 from trac.config import IntOption
 from trac.notification import NotificationSystem, NotifyEmail
 from trac.prefs import IPreferencePanelProvider
+
 from trac.web import auth
 from trac.web.api import IAuthenticator
 from trac.web.main import IRequestHandler, IRequestFilter
@@ -53 +57 @@
     if password != req.args.get('password_confirm'):
         raise TracError('The passwords must match.')
 
+
+
+
     mgr.set_password(user, password)
 
     db = env.get_db_cnx()
@@ -157 +164 @@
                           'store does not support writing.')
         return writable
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     #IPreferencePanelProvider methods
     def get_preference_panels(self, req):
         if not self._write_check():
@@ -179 +205 @@
 
     # IRequestFilter methods
     def pre_process_request(self, req, handler):
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         return handler
 
     def post_process_request(self, req, template, data, content_type):
@@ -377 +420 @@
             except TracError, e:
                 data['registration_error'] = e.message
             else:
-                req.redirect(req.href.login())
+                redirect_url = None
+                referer = req.args.get('referer')
+                if referer:
+                    redirect_url = "%s?referer=%s" % (req.href.login(), referer)
+                req.redirect(redirect_url or req.href.login())
         data['reset_password_enabled'] = \
             (self.env.is_component_enabled(AccountModule)
              and NotificationSystem(self.env).smtp_enabled)
@@ -422 +469 @@
     match_request = if_enabled(auth.LoginModule.match_request)
 
     def process_request(self, req):
-        if req.path_info.startswith('/login') and req.authname == 'anonymous':
+        if req.path_info.startswith('/login') and :
             data = {
                 'referer': self._referer(req),
                 'reset_password_enabled': AccountModule(self.env).reset_password_enabled
@@ -432 +479 @@
             return 'login.html', data, None
         return auth.LoginModule.process_request(self, req)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     def _do_login(self, req):
         if not req.remote_user:
             req.redirect(self.env.abs_href())
-        return auth.LoginModule._do_login(self, req)
+        res = auth.LoginModule._do_login(self, req)
+        if req.args.get('rememberme', '0') == '1':
+            req.outcookie['trac_auth']['expires'] = 86400 * 30
+            req.outcookie['trac_auth_session'] = '1'
+            req.outcookie['trac_auth_session']['path'] = self.env.href()
+        return res
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     def _remote_user(self, req):
         user = req.args.get('user')
         password = req.args.get('password')
@@ -449 +535 @@
     def _redirect_back(self, req):
         """Redirect the user back to the URL she came from."""
         referer = self._referer(req)
-        if referer and not referer.startswith(req.base_url):
-            # don't redirect to external sites
-            referer = None
+        if referer:
+            u = urlparse.urlparse(referer)
+            r = urlparse.urlparse(req.base_url)
+            if u[1] and u[1] != r[1]:
+                # don't redirect to external sites
+                referer = None
         req.redirect(referer or self.env.abs_href())
 
     def _referer(self, req):
@@ -576 +665 @@
     def _send_email(self, req):
         notifier = EmailVerificationNotification(self.env)
         notifier.notify(req.authname, req.session['email_verification_token'])
+

acct_mgr/templates/register.html

@@ -24 +24 @@
       </div>
 
       <form method="post" id="acctmgr_registerform" action="">
+
         <fieldset>
           <legend>Required</legend>
           <div>
@@ -43 +44 @@
                      class="textwidget" size="20" />
             </label>
           </div>
-        </fieldset>
-        <fieldset>
-          <legend>Optional</legend>
           <div>
             <label>Name:
               <input type="text" name="name" class="textwidget" size="20" />

acct_mgr/templates/login.html

@@ -28 +28 @@
         <input type="hidden" name="referer" value="${referer}" />
         <div>
           <label for="user">Username:</label>
-          <input type="text" id="user" name="user" class="textwidget" size="20" />
+          <input type="text" id="user" name="user" class="textwidget" size="20" />
         </div>
         <div>
           <label for="password">Password:</label>
           <input type="password" id="password" name="password" class="textwidget" size="20" />
         </div>
+
+
+
+
         <input type="submit" value="Login" />
 
         <p py:if="reset_password_enabled">