Changeset 1303

Timestamp:

14/07/06 17:32:01 (15 years ago)

Author:

pjkersha

Message:

NDG/Session.py:

• UserSession? createSessID -> addNewSessID public method to enable more than one session ID

to be tied to one session.

• deleteUserSession - fix to input keyword args

NDG/CredWallet.py: fix to reqAuthorisation authzResp check.

Location:

TI12-security/trunk/python

Files:

• NDG/CredWallet.py (modified) (1 diff)
• NDG/Session.py (modified) (10 diffs)
• Tests/SecurityClientTest.py (modified) (1 diff)

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

@@ -538 +538 @@
 
 
-            if authzResp['statCode'] == authorisationResp.accessDenied:
+            if authzResp['statCode'] == authzResp.accessDenied:
                 raise CredWalletAuthorisationDenied,\
                             "Authorisation denied: %s" % authzResp['errMsg']
 
-            elif authzResp['statCode'] == authorisationResp.accessGranted:
+            elif authzResp['statCode'] == authzResp.accessGranted:
                 attCert = authzResp['credential']
                 

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

@@ -107 +107 @@
 
 
+    #_________________________________________________________________________
     def __init__(self, *credWalletArgs, **credWalletKeys):
         """Initialise UserSession with args and keywords to CredWallet"""
@@ -118 +119 @@
         # it.  These are stored in a list
         self.__sessIDlist = []
-        self.__createSessID()
+        self.addNewSessID()
         self.__credWallet = CredWallet(*credWalletArgs, **credWalletKeys)
 
-               
-#    def __repr__(self):
-#        "Represent User Session"        
-#        return "<UserSession instance>"
-
+
+    #_________________________________________________________________________
     def __setCookieDomain(self, cookieDomain):
         """Set domain for cookie - set to None to assume domain of web server
@@ -137 +135 @@
         self.__cookieDomain = cookieDomain
 
-    cookieDomain = property(fset=__setCookieDomain,
-                            doc="Set cookie domain")
+    cookieDomain = property(fset=__setCookieDomain, doc="Set cookie domain")
 
 
@@ -173 +170 @@
 
     #_________________________________________________________________________
-    def __createSessID(self):
+    def addNewSessID(self):
         """Add a new session ID to be associated with this UserSession
         instance"""
@@ -769 +766 @@
         try:   
             # Check for an existing session for the same user
-            userDN = proxyCert.dn
+            try:
+                userDN = str(X509CertParse(proxyCert).dn)
+                
+            except Exception, e:
+                raise SessionMgrError, \
+                "Parsing input proxy certificate DN for session create: %s"%\
+                                                                        str(e)
+
             if userDN in self.__dnDict:
-                raise SessionMgrError, \
-                                "Session already exists for user \"%s\"" % dn
-            
-            # Create a new user session using the new proxy certificate
-            # and session ID
-            #
-            # Nb. Client pub/pri key info to allow message level 
-            # encryption for responses from Attribute Authority WS
-            userSess = UserSession(proxyCert, 
+                # Update existing session with proxy cert and add a new 
+                # session ID to access it - a single session can be accessed
+                # via multiple session IDs e.g. a user may wish to access the
+                # same session from the their desktop PC and their laptop.
+                # Different session IDs are allocated in each case.
+                userSess = self.__dnDict[userDN]
+                userSess.addNewSessID()
+                
+            else:
+                # Create a new user session using the new proxy certificate
+                # and session ID
+                #
+                # Nb. Client pub/pri key info to allow message level 
+                # encryption for responses from Attribute Authority WS
+                userSess = UserSession(proxyCert, 
                                    caPubKeyFilePath=self.__prop['caCertFile'],
                                    clntPubKeyFilePath=self.__prop['certFile'],
                                    clntPriKeyFilePath=self.__prop['keyFile'],
                                    clntPriKeyPwd=self.__prop['keyPPhrase'],
-                                   credRepos=self.__credRepos)                
+                                   credRepos=self.__credRepos)
+
+                # Also allow access by user DN
+                self.__dnDict[userDN] = userSess
+
+                                
             newSessID = userSess.latestSessID
             
@@ -794 +809 @@
             # Add new session to list                 
             self.__sessDict[newSessID] = userSess
-
-            # Also allow access by user DN
-            self.__dnDict[userDN] = userSess
                     
             # Return new session
@@ -812 +824 @@
         __connect2UserSession([proxyCert]|[sessID])
         
-        proxyCert:    proxy certificate corresponding to an existing 
+        proxyCert:    proxy certificate string corresponding to an existing 
                       session to connect to.
         sessID:       similiarly, a web browser session ID linking to an
@@ -840 +852 @@
         elif 'proxyCert' in idKeys:
             try:
-                userDN = X509Cert(idKeys['proxyCert']).dn
+                userDN = str(X509CertParse(idKeys['proxyCert']).dn)
                 
             except Exception, e:
@@ -868 +880 @@
 
     #_________________________________________________________________________        
-    def deleteUserSession(self, sessID=sessID, proxyCert=proxyCert):
+    def deleteUserSession(self, sessID=None, proxyCert=None):
         """Delete an existing session by providing a valid session ID or
         proxy certificate - use for user logout
@@ -894 +906 @@
         elif proxyCert:
             try:
-                userDN = X509Cert(idKeys['proxyCert']).dn
+                userDN = str(X509CertParse(idKeys['proxyCert']).dn)
                 
             except Exception, e:

TI12-security/trunk/python/Tests/SecurityClientTest.py

@@ -147 +147 @@
             # NDG.SessionMgrIO.AuthorisationResp
             if 'errMsg' in authResp:
-                print "Authorisation failed for user %s" % authResp['errMsg']            
+                print "Authorisation failed for user: %s" % authResp['errMsg']            
             else:
                 print "User authorised"