Changeset 1245 for trunk/rp/trac

Timestamp:

01/30/08 14:53:48 (11 months ago)

Author:

dbuss

Message:

#378 redirect fixes broke some use cases

Location:

trunk/rp/trac/infocard_acct/0.11/infocard_acct

Files:

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

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

@@ -167 +167 @@
 #                                               self.log.debug('LDAPUserStore:check_password \"%s\"', entry[1])
                                         l.simple_bind_s(results[0][0], password)
-#                                       self.log.debug('LDAPUserStore:check_password succeeded')
+                                        self.log.debug('LDAPUserStore:check_password succeeded')
                                         return True
                                 elif len(results) == 0:

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

@@ -74 +74 @@
            </div>
            
-           <fieldset id="traditional_login">
+           <fieldset id="traditional_login" py:if="not up_hide">
                <h1 py:if="display_infocard">Username / Password Login</h1>
                    <p class="help" py:if="help_text">

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

@@ -193 +193 @@
                     'display_infocard': True,
                     'infocards': self.processors,
-                    'help_text': self.config.get('infocard_acct', 'up_help_text', 'Use existing credentials to authenticate to your account')
+                    'help_text': self.config.get('infocard_acct', 'up_help_text', 'Use existing credentials to authenticate to your account'),
+                    'up_hide': self.config.get('infocard_acct', 'up_hide', False)
                 }
 
@@ -219 +220 @@
 
                     data['cardkeyhash'] = cardkeyhash
-                    
                     data['title'] = 'Associate'
                     data['login_header'] = 'Login to associate an InfoCard with an Account'
@@ -228 +228 @@
                     data['display_infocard'] = False
                     data['help_text'] = self.config.get('infocard_acct', 'associate_help_text')
+                    data['up_hide'] = False
                 return 'authenticate.html', data, None
             elif req.args.get('xmlToken'):
                 secToken = self._get_token(req)
                 data = {'infocard': secToken}
-                
+
                 if self._get_option(req, 'debug_page'):
                     self.log.debug('debug_page %s', req.remote_user)
@@ -247 +248 @@
                     self._remote_user(req)
                 self._setup_session(req)
-            else:
+            elif not self._remote_user(req):
                 self._redirect_back(req)
         return auth.LoginModule.process_request(self, req)
@@ -303 +304 @@
             pass
 
-
     def _get_token(self, req):
         """get the security token, cache it on the request so it isn't reparsed
@@ -321 +321 @@
         the side effect of actually verifying username/password or credentials
         """
-        
-        #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')
@@ -333 +333 @@
                     if associateduser: 
                         if associateduser != user:
-                            self.log.debug('web_user:LoginModule:_remote_user'
+                            self.log.debug('web_ui:LoginModule:_remote_user'
                                 '\"%s\" != \"%s\"', user, associateduser)
                             return None
@@ -339 +339 @@
                         self.log.debug('web_user:LoginModule:_remote_user:set_association for \"%s\"', user)
                         AssociationManager(self.env).set_association(user, req.args.get('cardkeyhash'))
+#                self.log.debug('web_ui:LoginModule:_remote_user check_password worked returning '
+#                                '\"%s\"', user)
                 return user
             elif req.args.get('xmlToken') and req.path_info.startswith('/login'):
@@ -352 +354 @@
                         if associateduser:
                             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_ui:LoginModule:_remote_user:check_association failed')
+        self.log.debug('web_ui:LoginModule:_remote_user: -> None')
         return None
 
@@ -360 +362 @@
         debug logins, otherwise we allow trac to handle the request redirect."""
         referer = self._referer(req)
-        if referer and not referer.startswith(req.base_url):
+        if referer and ((not referer.startswith(req.base_url)) 
+            or (referer.endswith("login"))):
             # don't redirect to external sites
             referer = None