Changeset 1241 for trunk/rp/trac

Timestamp:

01/29/08 09:18:11 (11 months ago)

Author:

dbuss

Message:

#379 Redirect back to the login page. This causes Trac Error
Authentication information not available. Please refer to the installation documentation.

Location:

trunk/rp/trac/infocard_acct/0.11/infocard_acct

Files:

• templates/authenticate.html (modified) (1 diff)
• web_ui.py (modified) (7 diffs)

trunk/rp/trac/infocard_acct/0.11/infocard_acct/templates/authenticate.html

@@ -9 +9 @@
     <title>${title}</title>
     <script type="text/javascript">
-    $(document).ready(function() {
-        $('#user')[0].focus();
-    });
         
         submited = false;

trunk/rp/trac/infocard_acct/0.11/infocard_acct/web_ui.py

@@ -208 +208 @@
                         if secToken and secToken.isValid:
                             cardkeyhash = secToken.getMetaDataValues(infocard.infocardlib.META_CardKeyHash)
+                            self.log.debug('setup session: pre associate')
                             self._setup_session(req)
                         elif secToken:
@@ -233 +234 @@
                 
                 if self._get_option(req, 'debug_page'):
+                    self.log.debug('debug_page %s', req.remote_user)
                     self._do_debug_login(req)
                     self._setup_session(req)
@@ -242 +244 @@
                 if (not secToken.isValid) or self._get_option(req, 'debug_page'):
                     return 'infocard-detail.html', data, None
-
-            self._setup_session(req)
+                if not req.remote_user:
+                    self._remote_user(req)
+                self._setup_session(req)
+            else:
+                self._redirect_back(req)
         return auth.LoginModule.process_request(self, req)
 
@@ -317 +322 @@
         """
         
-#       self.log.debug('web_ui:LoginModule:_remote_user' )
+        #self.log.debug('web_ui:LoginModule:_remote_user' )
         user = req.args.get('user')
         password = req.args.get('password')
@@ -332 +337 @@
                             return None
                     else :
-                        #self.log.debug('web_user:LoginModule:_remote_user:set_association for \"%s\"', user)
+                        self.log.debug('web_user:LoginModule:_remote_user:set_association for \"%s\"', user)
                         AssociationManager(self.env).set_association(user, req.args.get('cardkeyhash'))
                 return user
@@ -341 +346 @@
                     user = AssociationManager(self.env).check_association(secToken.getMetaDataValues(infocard.infocardlib.META_CardKeyHash))
                     if user:
-                        #self.log.debug('web_user:LoginModule:_remote_user:check_association returned : \"%s\"', user)
+#                        self.log.debug('web_user:LoginModule:_remote_user:check_association returned : \"%s\"', user)
                         return user
                     else:
@@ -348 +353 @@
                             return associateduser
                         self.log.debug('web_user:LoginModule:_remote_user:check_association failed')
-        #self.log.debug('web_user:LoginModule:_remote_user: -> None')
+        self.log.debug('web_user:LoginModule:_remote_user: -> None')
         return None