Changeset 6721 for TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthority/test_attributeauthority.py

Timestamp:

11/03/10 14:55:42 (11 years ago)

Author:

pjkersha

Message:

• Working Attribute Authority client unit tests. Configuration parameters such as issuer and flags to test query timestamp and SAML version string have now been moved out of the Attribute Authority to the generic SAML subject Query middleware interface ndg.security.server.wsgi.saml.SOAPQueryInterfaceMiddleware. This could be moved into the SAML egg at a later stage. The AuthzDecisionQuery? interface should be retested to allow for these changes.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthority/test_attributeauthority.py (modified) (8 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthority/test_attributeauthority.py

@@ -46 +46 @@
     PROPERTIES_FILENAME = 'test_attributeauthority.cfg'
     PROPERTIES_FILEPATH = path.join(THIS_DIR, PROPERTIES_FILENAME)
-    ISSUER_NAME = '/O=My Organisation/OU=Centre/CN=Attribute Authority'
     ASSERTION_LIFETIME = "86400"
 
@@ -54 +53 @@
         self.assert_(aa)
         self.assert_(aa.assertionLifetime == 3600)
-        self.assert_(aa.issuerName == cls.ISSUER_NAME)
         
     def _createAttributeAuthorityHelper(self):
@@ -66 +64 @@
                                        'AttributeInterface')
         
-        aa = AttributeAuthority.fromProperties(issuerName=cls.ISSUER_NAME,
+        aa = AttributeAuthority.fromProperties(
                     assertionLifetime=cls.ASSERTION_LIFETIME,
                     attributeInterface_className=attributeInterfaceClassName)
@@ -81 +79 @@
         # Check lifetime property converted from string input to float
         self.assert_(aa.assertionLifetime == float(cls.ASSERTION_LIFETIME))
-        self.assert_(aa.issuerName == cls.ISSUER_NAME)
         self.assert_(isinstance(aa.attributeInterface, AttributeInterface))
 
@@ -92 +89 @@
         self.assert_(aa2)
         self.assert_(aa2.assertionLifetime == aa.assertionLifetime)
-        self.assert_(aa2.issuerName == aa.issuerName)
         self.assert_(isinstance(aa2.attributeInterface, AttributeInterface))
     
@@ -322 +318 @@
             '/O=ESG/OU=NCAR/CN=Gateway')
         
-        attributeInterface.setProperties(samlAssertionLifetime=28800.,
-                                issuerName='/CN=Attribute Authority/O=Site A')
+        attributeInterface.setProperties(samlAssertionLifetime=28800.)
         
         attributeInterface.samlSubjectSqlQuery = (
@@ -414 +409 @@
         
             SQLAlchemyAttributeInterfaceTestCase.ATTRIBUTE_NAMES[0]: 
-                SQLAlchemyAttributeInterfaceTestCase.SAML_ATTRIBUTES_SQLQUERY                    
+                SQLAlchemyAttributeInterfaceTestCase.SAML_ATTRIBUTES_SQLQUERY
         }
         
@@ -427 +422 @@
             '/O=ESG/OU=NCAR/CN=Gateway')
         
-        attributeInterface.setProperties(samlAssertionLifetime=28800.,
-                                issuerName='/CN=Attribute Authority/O=Site A')
+        attributeInterface.setProperties(samlAssertionLifetime=28800.)
         
         attributeInterface.samlSubjectSqlQuery = (