Changeset 6572 for TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test

Timestamp:

15/02/10 11:33:01 (11 years ago)

Author:

pjkersha

Message:

Working refactored Attribute Authority Client unit tests.

Location:

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient

Files:

• __init__.py (modified) (1 diff)
• test_attributeauthorityclient.py (modified) (1 diff)
• test_samlattributeauthorityclient.cfg (modified) (1 diff)
• test_samlattributeauthorityclient.py (modified) (9 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient/__init__.py

@@ -43 +43 @@
         except KeyError:
             self.sslCACertList = []
-            
-        self.startAttributeAuthorities()        
+       

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_attributeauthorityclient.py

@@ -32 +32 @@
     pemPat = "-----BEGIN CERTIFICATE-----[^\-]*-----END CERTIFICATE-----"
 
+    def __init__(self, *arg, **kw):
+        super(AttributeAuthorityClientTestCase, self).__init__(*arg, **kw)            
+        self.startAttributeAuthorities() 
+        
     def _getCertChainFromProxyCertFile(self, proxyCertFilePath):
         '''Read proxy cert and user cert from a single PEM file and put in

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_samlattributeauthorityclient.cfg

@@ -30 +30 @@
 subject = https://openid.localhost/philip.kershaw
 siteAttributeName = invalid-attr
+prefix = saml.
+saml.serialise = saml.xml.etree:AttributeQueryElementTree.toXML
+saml.deserialise = saml.xml.etree:ResponseElementTree.fromXML
 
 [test05AttributeQuerySOAPBindingInterface]

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_samlattributeauthorityclient.py

@@ -26 +26 @@
                                         AttributeQuerySOAPBinding, 
                                         AttributeQuerySslSOAPBinding)
-from ndg.security.common.saml_utils.esg import EsgSamlNamespaces
+from ndg.security.common.saml_utils.esg import (EsgSamlNamespaces,
+                                                EsgDefaultQueryAttributes)
 from ndg.security.test.unit.attributeauthorityclient import \
                                         AttributeAuthorityClientBaseTestCase
@@ -40 +41 @@
         super(AttributeAuthoritySAMLInterfaceTestCase, self).__init__(*arg, 
                                                                       **kw)
+        
+        # Run same config but on two different ports - one HTTP and one HTTPS
+        self.startSiteAAttributeAuthority()
         self.startSiteAAttributeAuthority(withSSL=True, port=5443)
        
@@ -54 +58 @@
         attributeQuery.issuer.value = "/CN=Authorisation Service/O=Site A"    
                         
-        attributeQuery.subject = Subject()  
+        attributeQuery.subject = Subject()
         attributeQuery.subject.nameID = NameID()
         attributeQuery.subject.nameID.format = EsgSamlNamespaces.NAMEID_FORMAT
@@ -120 +124 @@
         attributeQuery.issuer = Issuer()
         attributeQuery.issuer.format = Issuer.X509_SUBJECT
-        attributeQuery.issuer.value = "Invalid Site"    
+        attributeQuery.issuer.value = "/O=Invalid Site/CN=PDP"    
                         
         attributeQuery.subject = Subject()  
@@ -136 +140 @@
 
         binding = SOAPBinding()
+        binding.serialise = AttributeQueryElementTree.toXML
+        binding.deserialise = ResponseElementTree.fromXML
         response = binding.send(attributeQuery, _cfg['uri'])
 
@@ -174 +180 @@
 
         binding = SOAPBinding()
+        binding.serialise = AttributeQueryElementTree.toXML
+        binding.deserialise = ResponseElementTree.fromXML
         response = binding.send(attributeQuery, _cfg['uri'])
         
@@ -186 +194 @@
              
     def test04SAMLAttributeQueryInvalidAttrName(self):
-        _cfg = self.cfg['test04SAMLAttributeQueryInvalidAttrName']
+        thisSection = 'test04SAMLAttributeQueryInvalidAttrName'
+        _cfg = self.cfg[thisSection]
         
         attributeQuery = AttributeQuery()
@@ -210 +219 @@
         attributeQuery.attributes.append(invalidAttribute) 
 
-        binding = SOAPBinding()
+        binding = SOAPBinding.fromConfig(
+                     AttributeAuthoritySAMLInterfaceTestCase.CONFIG_FILENAME, 
+                     prefix='saml.', 
+                     section=thisSection)
         response = binding.send(attributeQuery, _cfg['uri'])
         
@@ -229 +241 @@
         
         binding.subjectID = AttributeAuthoritySAMLInterfaceTestCase.OPENID_URI
-        binding.issuerDN = \
-            AttributeAuthoritySAMLInterfaceTestCase.VALID_REQUESTOR_IDS[0]        
+        binding.subjectIdFormat = EsgSamlNamespaces.NAMEID_FORMAT
+        binding.issuerName = \
+            str(AttributeAuthoritySAMLInterfaceTestCase.VALID_REQUESTOR_IDS[0])
+        binding.issuerFormat = Issuer.X509_SUBJECT
         
         binding.queryAttributes = EsgDefaultQueryAttributes.ATTRIBUTES