Changeset 1190

Timestamp:

15/06/06 11:28:33 (15 years ago)

Author:

pjkersha

Message:

NDG/SecurityCGI.py: processCredsRequest only picks up an existing cookie if no cookie was input, AND if an
existing cookie is picked up and is not an NDG security one, then it's silently ignored.

Location:

TI12-security/trunk/python

Files:

• NDG/SecurityCGI.py (modified) (1 diff)
• dist/NDG-Security-0.68.tar.gz (modified) (previous)

TI12-security/trunk/python/NDG/SecurityCGI.py

@@ -277 +277 @@
                                                          
         # Check for cookie in environment
-        if 'HTTP_COOKIE' in os.environ:
+        if sessCookie is None and 'HTTP_COOKIE' in os.environ:
     
             # Get session ID from existing cookie
             sessCookie = SimpleCookie(os.environ['HTTP_COOKIE'])
 
-        if sessCookie:
-            # Cookie is set - check for NDG cookie
-            try:
-                UserSession.isValidSecurityCookie(sessCookie, raiseExcep=True)
+        # Check for NDG cookie
+        if sessCookie and UserSession.isValidSecurityCookie(sessCookie):
                 
-            except UserSessionError, e:
-                raise SecurityCGIError, \
-                                    'Checking existing session cookie: %s' % e
-
             # Return cookie to requestor
             self.returnCreds(sessCookie, returnURI, **returnCredsKwArgs)