Changeset 3001

Timestamp:

07/11/07 14:44:00 (13 years ago)

Author:

pjkersha

Message:

python/ndg.security.server/ndg/security/server/AttAuthority/init.py: role mapping entries are not necessary for <trusted> blocks in map config file - altered readMapConfig accordingly.

python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py: fix to test8GetMappedAttCertStressTest - set signingCertChain to None in AttAuthorityClient? when not using proxy certs.

python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg: try out GetMappedAttCertStressTest? with standard certs rather than proxy certs.

python/ndg.security.test/ndg/security/test/SessionMgr/README: fixed instructions for running tests.

python/ndg.security.common/ndg/security/common/CredWallet.py: fixed typo self.debug -> log.debug.

Location:

TI12-security/trunk/python

Files:

• README (modified) (1 diff)
• ndg.security.common/ndg/security/common/CredWallet.py (modified) (1 diff)
• ndg.security.server/ndg/security/server/AttAuthority/__init__.py (modified) (2 diffs)
• ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py (modified) (2 diffs)
• ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg (modified) (1 diff)
• ndg.security.test/ndg/security/test/SessionMgr/README (modified) (1 diff)

TI12-security/trunk/python/README

@@ -1 @@
-NDG Security Post-Alpha Development Version
+NDG Security Beta Development Version
 ___________________________________________
 

TI12-security/trunk/python/ndg.security.common/ndg/security/common/CredWallet.py

@@ -734 +734 @@
         """
         
-        self.debug(\
+        log.debug(\
         'CredWallet.getAATrustedHostInfo for role "%s" and service: "%s"' % \
                    (userRole, aaURI or aaPropFilePath))

TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py

@@ -766 +766 @@
         # Information about trusted hosts
         for elem in trustedElem:
-
-            roleElem = elem.findall('role')
-            if not roleElem:
-                raise AttAuthorityError("\"role\" tag not found in \"%s\"" % \
-                                        self.__prop['mapConfigFile'])
-
             try:
                 trustedHost = elem.attrib.values()[0]
@@ -792 +786 @@
             for k in self.__mapConfig['trustedHosts'][trustedHost]:
                 self.__mapConfig['trustedHosts'][trustedHost][k] = \
-                                                        elem.findtext(k)
-            
-            # Role keyword value requires special parsing before assingment
-            self.__mapConfig['trustedHosts'][trustedHost]['role'] = \
+                                                        elem.findtext(k)   
+
+            roleElem = elem.findall('role')
+            if roleElem:
+                # Role keyword value requires special parsing before 
+                # assignment
+                self.__mapConfig['trustedHosts'][trustedHost]['role'] = \
                                         [dict(i.items()) for i in roleElem]
-                   
+            else:
+                # It's possible for trust relationships to not contain any 
+                # role mapping.  e.g. a site's login service trusting other
+                # sites login requests
+                self.__mapConfig['trustedHosts'][trustedHost]['role'] = []
+                       
             self.__localRole2RemoteRole[trustedHost] = {}
             self.__remoteRole2LocalRole[trustedHost] = {}
             
             for role in self.__mapConfig['trustedHosts'][trustedHost]['role']:
-
                 try:
                     localRole = role['local']

TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py

@@ -320 +320 @@
             signingCertChain = \
                         self._getCertChainFromProxyCertFile(proxyCertFilePath)       
+        else:
+            signingCertChain = None
 
         setSignatureHandler = \
@@ -335 +337 @@
 caCertFilePathList=caCertFilePathList,
 tracefile=sys.stderr)
-
+        import pdb;pdb.set_trace()
         acFilePathList = \
 self.cfg['test8GetMappedAttCertStressTest']['userattcertfilepathlist'].split()

TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg

@@ -113 +113 @@
 # ValueType for BinarySecurityToken element of WSSE header.  Specify
 # 'X509PKIPathv1' for use with proxy certificates
-#reqbinsectokvaltype = X509v3
+reqbinsectokvaltype = X509v3
 #reqbinsectokvaltype = X509
-reqbinsectokvaltype = X509PKIPathv1
+#reqbinsectokvaltype = X509PKIPathv1
 
 # Test with proxy certificates or with standard certs.  Comment out as 
 # appropriate
-proxycertfilepath = ./proxy-cert.pem
-#clntcertfilepath = ./aa-cert.pem
+#proxycertfilepath = ./proxy-cert.pem
+clntcertfilepath = ./aa-cert.pem
 
 clntprikeypwd = 

TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/README

@@ -1 @@
-Unit tests for Certificate Authority Web Service Client
+Unit tests for Session Manager Web Service Client
 _________________________________________________
 
-Before running the tests start the Certificate Authority web service:
+Before running the tests start the Session Manager web service:
 
 $ ./server.sh
 
-Run the unit test script caClientTest.py from a separate terminal.
+... and the Attribute Authority test services in ../AttAuthority:
+
+$ ./siteAServer.sh
+
+and in a separate terminal:
+
+$ ./siteBServer.sh
+
+Run the unit test script SessionMgrClientTest.py from a separate terminal.