Changeset 4576 for TI12-security/trunk/python

Timestamp:

09/12/08 14:08:49 (11 years ago)

Author:

pjkersha

Message:

Fixed sessionmanager unit tests- updated SessionManager?.getAttCert calls to allow for refactored error handling.

Location:

TI12-security/trunk/python

Files:

• ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py (modified) (4 diffs)
• ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py (modified) (4 diffs)
• ndg.security.test/ndg/security/test/sessionmanager/test_sessionmanager.py (modified) (7 diffs)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/attributeauthority/__init__.py

@@ -58 +58 @@
 
 
-    def soap_getAttCert(self, ps, **kw):
+    def soap_getAttCert(self, ps):
         '''Retrieve an Attribute Certificate
         
@@ -103 +103 @@
        
 
-    def soap_getHostInfo(self, ps, **kw):
+    def soap_getHostInfo(self, ps):
         '''Get information about this host
                 
@@ -128 +128 @@
        
 
-    def soap_getAllHostsInfo(self, ps, **kw):
+    def soap_getAllHostsInfo(self, ps):
         '''Get information about all hosts
                 
@@ -182 +182 @@
 
 
-    def soap_getTrustedHostInfo(self, ps, **kw):
+    def soap_getTrustedHostInfo(self, ps):
         '''Get information about other trusted hosts
                 

TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py

@@ -66 +66 @@
 
 
-    def soap_connect(self, ps, **kw):
+    def soap_connect(self, ps):
         '''Connect to Session Manager and create a user session
         
@@ -91 +91 @@
 
 
-    def soap_disconnect(self, ps, **kw):
+    def soap_disconnect(self, ps):
         '''Disconnect and remove user's session
         
@@ -132 +132 @@
 
 
-    def soap_getSessionStatus(self, ps, **kw):
+    def soap_getSessionStatus(self, ps):
         '''Check for existence of a session with given session ID or user
         Distinguished Name
@@ -154 +154 @@
 
 
-    def soap_getAttCert(self, ps, **kw):
+    def soap_getAttCert(self, ps):
         '''Get Attribute Certificate from a given Attribute Authority
         and cache it in user's Credential Wallet

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

@@ -21 +21 @@
 
 from ndg.security.common.utils.configfileparsers import \
-                                                    CaseSensitiveConfigParser
+    CaseSensitiveConfigParser
 from ndg.security.common.X509 import X509CertParse
-from ndg.security.server.sessionmanager import SessionManager
+from ndg.security.server.sessionmanager import SessionManager, \
+    CredentialWalletAttributeRequestDenied
 from ndg.security.server.attributeauthority import AttributeAuthority
 
@@ -275 +276 @@
         section = 'test07GetAttCertWithSessID'
         aaURI = self.cfg.get(section, 'aaURI')
-        attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
-                                                attributeAuthorityURI=aaURI)
-        if errMsg:
-            self.fail(errMsg)
-            
+        attCert = self.sm.getAttCert(sessID=self.sessID, 
+                                     attributeAuthorityURI=aaURI)
         print("Attribute Certificate:\n%s" % attCert) 
         attCert.filePath = xpdVars(self.cfg.get(section, 'acOutputFilePath')) 
@@ -294 +292 @@
         aaURI = self.cfg.get('test08GetAttCertRefusedWithSessID', 'aaURI')
         
-        attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
-                                                 attributeAuthorityURI=aaURI,
-                                                 mapFromTrustedHosts=False)
-        if errMsg:
-            print("SUCCESS - obtained expected result: %s" % errMsg)
+        try:
+            attCert = self.sm.getAttCert(sessID=self.sessID, 
+                                         attributeAuthorityURI=aaURI,
+                                         mapFromTrustedHosts=False)
+        except CredentialWalletAttributeRequestDenied, e:
+            print("SUCCESS - obtained expected result: %s" % e)
             return
         
@@ -316 +315 @@
         aaURI = self.cfg.get('test09GetMappedAttCertWithSessID', 'aaURI')
         
-        attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID,
-                                                   attributeAuthorityURI=aaURI,
-                                                   mapFromTrustedHosts=True)
-        if errMsg:
-            self.fail(errMsg)
+        attCert = self.sm.getAttCert(sessID=self.sessID,
+                                     attributeAuthorityURI=aaURI,
+                                     mapFromTrustedHosts=True)
             
         print("Attribute Certificate:\n%s" % attCert)  
@@ -337 +334 @@
         extAttCert = open(extACFilePath).read()
         
-        attCert, errMsg, extAttCertList = self.sm.getAttCert(
-                                                   sessID=self.sessID, 
-                                                   attributeAuthorityURI=aaURI,
-                                                   extAttCertList=[extAttCert])
-        if errMsg:
-            self.fail(errMsg)
-          
+        attCert = self.sm.getAttCert(sessID=self.sessID, 
+                                     attributeAuthorityURI=aaURI,
+                                     extAttCertList=[extAttCert])
         print("Attribute Certificate:\n%s" % attCert)  
 
@@ -356 +349 @@
         
         aaURI = self.cfg.get('test11GetAttCertWithUserX509Cert', 'aaURI')
-        attCert, errMsg, extAttCertList = self.sm.getAttCert(
-                                     userX509Cert=self.userX509Cert, 
+        attCert = self.sm.getAttCert(userX509Cert=self.userX509Cert, 
                                      attributeAuthorityURI=aaURI)
-        if errMsg:
-            self.fail(errMsg)
-          
         print("Attribute Certificate:\n%s" % attCert)  
 
@@ -376 +365 @@
                                               propPrefix='attributeAuthority')
         
-        attCert, errMsg, extAttCertList=self.sm.getAttCert(sessID=self.sessID, 
-                                        attributeAuthority=attributeAuthority)
-        if errMsg:
-            self.fail(errMsg)
-            
+        attCert = self.sm.getAttCert(sessID=self.sessID, 
+                                     attributeAuthority=attributeAuthority)            
         print("Attribute Certificate:\n%s" % attCert) 
         attCert.filePath = xpdVars(self.cfg.get(section, 'acOutputFilePath'))