Changeset 4447 for TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmanager/test_sessionmanager.py

Timestamp:

19/11/08 13:10:48 (11 years ago)

Author:

pjkersha

Message:

• Updated Session Manager unit tests to include a call to a locally instantiated Attribute Authority
• fixed bug in CredentialWallet?.getAttCert - ensure attributeAuthority keyword input correctly picked up.

File:

• TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmanager/test_sessionmanager.py (modified) (14 diffs)

TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionmanager/test_sessionmanager.py

@@ -23 +23 @@
                                                     CaseSensitiveConfigParser
 from ndg.security.common.X509 import X509CertParse
-from ndg.security.server.sessionmanager import *
+from ndg.security.server.sessionmanager import SessionManager
+from ndg.security.server.attributeauthority import AttributeAuthority
 
 from os.path import expandvars as xpdVars
@@ -130 +131 @@
         print("Finished setting up connection")
    
-    def test1Connect2AuthNServiceWithNoUserCertReturned(self):
-        
-        username = self.cfg.get('test1Connect', 'username')
+    def test01Connect2AuthNServiceWithNoUserCertReturned(self):
+        
+        thisSection = 'test01Connect2AuthNServiceWithNoUserCertReturned'
+        username = self.cfg.get(thisSection, 'username')
         if SessionManagerTestCase.passphrase is None and \
-           self.cfg.has_option('test1Connect', 'passphrase'):
-            SessionManagerTestCase.passphrase=self.cfg.get('test1Connect', 
-                                                                'passphrase')
+           self.cfg.has_option(thisSection, 'passphrase'):
+            SessionManagerTestCase.passphrase=self.cfg.get(thisSection, 
+                                                           'passphrase')
         
         if not SessionManagerTestCase.passphrase:
@@ -150 +152 @@
         assert(issuingCert is None)
         
-        print "User '%s' connected to Session Manager:\n%s" % \
-                                                        (username, sessID)       
+        print("User '%s' connected to Session Manager:\n%s"%(username, sessID))     
                                   
-    def test2Connect2AuthNServiceReturningAUserCert(self):
-        
-        section = 'test2Connect2AuthNServiceReturningAUserCert'
+    def test02Connect2AuthNServiceReturningAUserCert(self):
+        
+        section = 'test02Connect2AuthNServiceReturningAUserCert'
         
         # Change to alternative authentication service
@@ -185 +186 @@
     
             
-    def test3GetSessionStatus(self):
-        """test3GetSessionStatus: check a session is alive"""
+    def test03GetSessionStatus(self):
+        """test03GetSessionStatus: check a session is alive"""
         
         self._connect()
@@ -197 +198 @@
         print "CORRECT: sessID=abc doesn't exist"
         
-    def test4ConnectNoCreateServerSess(self):
-        """test4ConnectNoCreateServerSess: Connect to retrieve credentials
+    def test04ConnectNoCreateServerSess(self):
+        """test04ConnectNoCreateServerSess: Connect to retrieve credentials
         only - no session is created.  This makes sense only for an AuthN
         Service that returns user credentials"""
-        section = 'test4ConnectNoCreateServerSess'
+        section = 'test04ConnectNoCreateServerSess'
         
         # Change to alternative authentication service
@@ -243 +244 @@
             
 
-    def test5DisconnectWithSessID(self):
-        """test5DisconnectWithSessID: disconnect as if acting as a browser 
+    def test05DisconnectWithSessID(self):
+        """test05DisconnectWithSessID: disconnect as if acting as a browser 
         client 
         """
@@ -254 +255 @@
             
 
-    def test6DisconnectWithUserCert(self):
+    def test06DisconnectWithUserCert(self):
         """test5DisconnectWithUserCert: Disconnect based on a user X.509
         cert. credential from an earlier call to connect 
@@ -266 +267 @@
 
 
-    def test7GetAttCertWithSessID(self):
-        """test7GetAttCertWithSessID: make an attribute request using
+    def test07GetAttCertWithSessID(self):
+        """test07GetAttCertWithSessID: make an attribute request using
         a session ID as authentication credential"""
 
         self._connect()
         
-        section = 'test7GetAttCertWithSessID'
+        section = 'test07GetAttCertWithSessID'
         aaURI = self.cfg.get(section, 'aaURI')
         attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
@@ -282 +283 @@
         attCert.filePath = xpdVars(self.cfg.get(section, 'acOutputFilePath')) 
         attCert.write()
-        
-        return self.sm
-
-
-    def test8GetAttCertRefusedWithSessID(self):
-        """test8GetAttCertRefusedWithSessID: make an attribute request using
+
+
+    def test08GetAttCertRefusedWithSessID(self):
+        """test08GetAttCertRefusedWithSessID: make an attribute request using
         a sessID as authentication credential requesting an AC from an
         Attribute Authority where the user is NOT registered"""
@@ -293 +292 @@
         self._connect()
         
-        aaURI = self.cfg.get('test8GetAttCertRefusedWithSessID', 'aaURI')
+        aaURI = self.cfg.get('test08GetAttCertRefusedWithSessID', 'aaURI')
         
         attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
@@ -305 +304 @@
 
 
-    def test9GetMappedAttCertWithSessID(self):
-        """test9GetMappedAttCertWithSessID: make an attribute request using
+    def test09GetMappedAttCertWithSessID(self):
+        """test09GetMappedAttCertWithSessID: make an attribute request using
         a session ID as authentication credential"""
 
@@ -313 +312 @@
         # Attribute Certificate cached in test 6 can be used to get a mapped
         # AC for this test ...
-        self.sm = self.test7GetAttCertWithSessID()
-
-        aaURI = self.cfg.get('test9GetMappedAttCertWithSessID', 'aaURI')
+        self.test07GetAttCertWithSessID()
+
+        aaURI = self.cfg.get('test09GetMappedAttCertWithSessID', 'aaURI')
         
         attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID,
@@ -364 +363 @@
           
         print("Attribute Certificate:\n%s" % attCert)  
+
+
+    def test12GetAttCertFromLocalAAInstance(self):
+        """test12GetAttCertFromLocalAAInstance: make an attribute request to a
+        locally instantiated Attribute Authority"""
+
+        self._connect()
+        
+        section = 'test12GetAttCertFromLocalAAInstance'
+        aaPropFilePath = self.cfg.get(section, 'aaPropFilePath')
+        attributeAuthority=AttributeAuthority(propFilePath=aaPropFilePath,
+                                              propPrefix='attributeAuthority')
+        
+        attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
+                                        attributeAuthority=attributeAuthority)
+        if errMsg:
+            self.fail(errMsg)
+            
+        print("Attribute Certificate:\n%s" % attCert) 
+        attCert.filePath = xpdVars(self.cfg.get(section, 'acOutputFilePath')) 
+        attCert.write()
 
 
@@ -372 +392 @@
         smTestCaseMap = map(SessionManagerTestCase,
                           (
-                            "test1Connect2AuthNServiceWithNoUserCertReturned",
-                            "test2Connect2AuthNServiceReturningAUserCert",
-                            "test3GetSessionStatus",
-                            "test4ConnectNoCreateServerSess",
-                            "test5DisconnectWithSessID",
-                            "test6DisconnectWithUserCert",
-                            "test7GetAttCertWithSessID",
-                            "test8GetAttCertRefusedWithSessID",
-                            "test9GetMappedAttCertWithSessID",
+                            "test01Connect2AuthNServiceWithNoUserCertReturned",
+                            "test02Connect2AuthNServiceReturningAUserCert",
+                            "test03GetSessionStatus",
+                            "test04ConnectNoCreateServerSess",
+                            "test05DisconnectWithSessID",
+                            "test06DisconnectWithUserCert",
+                            "test07GetAttCertWithSessID",
+                            "test08GetAttCertRefusedWithSessID",
+                            "test09GetMappedAttCertWithSessID",
                             "test10GetAttCertWithExtAttCertListWithSessID",
                             "test11GetAttCertWithUserCert",
+                            "test12GetAttCertFromLocalAAInstance",
                           ))
         unittest.TestSuite.__init__(self, smTestCaseMap)