Changeset 6720 for TI12-security/trunk/NDGSecurity

Timestamp:

11/03/10 11:30:36 (11 years ago)

Author:

pjkersha

Message:

• Attribute Authority unit tests now pass with refactored Attribute Authority which has NDG Attribute Certificate and role mapping code removed.
• Now refactoring client unit tests.
• Removed NDG Attribute Certificate and XMLSec unit tests - no longer needed.

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• ndg_security_server/ndg/security/server/attributeauthority.py (modified) (3 diffs)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/attributeCertificateLog (deleted)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/site-a.ini (modified) (2 diffs)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/siteAAttributeAuthority.cfg (deleted)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/sitea_attributeauthority.py (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/siteAServerApp.py)
• ndg_security_test/ndg/security/test/config/attributeauthority/sitea/sitea_attributeinterface.py (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/siteAUserRoles.py)
• ndg_security_test/ndg/security/test/unit/XMLSecDoc (deleted)
• ndg_security_test/ndg/security/test/unit/attCert (deleted)
• ndg_security_test/ndg/security/test/unit/attributeauthority/test_attributeauthority.py (modified) (3 diffs)
• ndg_security_test/ndg/security/test/unit/attributeauthorityclient/attAuthorityClientTest.cfg (deleted)
• ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_attributeauthorityclient.py (deleted)
• ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_samlattributeauthorityclient.py (modified) (2 diffs)
• ndg_security_test/ndg/security/test/unit/xmlsec (deleted)

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/attributeauthority.py

@@ -123 +123 @@
         '__propFileSection',
         '__propPrefix',
+        '__attributeInterface',
         '__attributeInterfaceCfg'
     )
@@ -140 +141 @@
         
         self.__attributeInterfaceCfg = {}
-
+        
+    def __getstate__(self):
+        '''Enable pickling with __slots__'''
+        _dict = {}
+        for attrName in AttributeAuthority.__slots__:
+            # Ugly hack to allow for derived classes setting private member
+            # variables
+            if attrName.startswith('__'):
+                attrName = "_AttributeAuthority" + attrName
+                
+            _dict[attrName] = getattr(self, attrName)
+            
+        return _dict
+  
+    def __setstate__(self, attrDict):
+        '''Enable pickling with __slots__'''
+        for attrName, val in attrDict.items():
+            setattr(self, attrName, val)
+            
+    def _getIssuerName(self):
+        return self.__issuerName
+
+    def _setIssuerName(self, value):
+        if not isinstance(value, basestring):
+            raise TypeError('Expecting string type for "issuerName" attribute; '
+                            'got %r' % type(value))
+        
+        self.__issuerName = value
+
+    issuerName = property(_getIssuerName, _setIssuerName, 
+                          doc="Name of Attribute Authority organisation "
+                              "issuing a response to a query")
+    
     def _getAssertionLifetime(self):
         return self.__assertionLifetime
-
-    def _getAttributeInterface(self):
-        return self.__attributeInterface
 
     def _setAssertionLifetime(self, value):
@@ -156 +186 @@
             raise TypeError('Expecting float, int, long or string type for '
                             '"assertionLifetime"; got %r' % type(value))
+
+    def _getAttributeInterface(self):
+        return self.__attributeInterface
 
     def _setAttributeInterface(self, value):

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/config/attributeauthority/sitea/site-a.ini

@@ -48 +48 @@
 
 # Lifetime is measured in seconds
-attributeAuthority.attCertLifetime: 28800 
-
-# Allow an offset for clock skew between servers running 
-# security services. NB, measured in seconds - use a minus sign for time in the
-# past
-attributeAuthority.attCertNotBeforeOff: 0
-
-# Clock skew for SAML Attribute Queries - allow clockSkew number of seconds
-# tolerance for query issueInstant parameter. Set here to 3 minutes
-attributeAuthority.clockSkew: 180.0
+attributeAuthority.assertionLifetime: 28800 
 
 attributeAuthority.dnSeparator:/
@@ -80 +71 @@
 saml.soapbinding.queryInterfaceKeyName = %(attributeQueryInterfaceEnvironKeyName)s
 
+# Clock skew for SAML Attribute Queries - allow clockSkew number of seconds
+# tolerance for query issueInstant parameter. Set here to 3 minutes
+saml.soapbinding.clockSkewTolerance: 180.0
 
 # Logging configuration

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

@@ -23 +23 @@
 from datetime import datetime
 from os import path
+import pickle
 
 from ndg.security.test.unit import BaseTestCase
@@ -46 +47 @@
     PROPERTIES_FILEPATH = path.join(THIS_DIR, PROPERTIES_FILENAME)
     ISSUER_NAME = '/O=My Organisation/OU=Centre/CN=Attribute Authority'
-    
+    ASSERTION_LIFETIME = "86400"
+
     def test01ParsePropertiesFile(self):
         cls = AttributeAuthorityTestCase
@@ -54 +56 @@
         self.assert_(aa.issuerName == cls.ISSUER_NAME)
         
-    def test02FromProperties(self):
-        
-        # Casts from string to float
-        assertionLifetime = "86400"
-        issuerName = 'My issuer'
+    def _createAttributeAuthorityHelper(self):
+        """Helper method to creat an Attribute Authority instance for use with 
+        tests
+        """
+        
+        cls = AttributeAuthorityTestCase
+        
         attributeInterfaceClassName = ('ndg.security.server.attributeauthority.'
                                        'AttributeInterface')
         
-        aa = AttributeAuthority.fromProperties(issuerName=issuerName,
-                    assertionLifetime=assertionLifetime,
+        aa = AttributeAuthority.fromProperties(issuerName=cls.ISSUER_NAME,
+                    assertionLifetime=cls.ASSERTION_LIFETIME,
                     attributeInterface_className=attributeInterfaceClassName)
         
+        return aa
+            
+    def test02FromProperties(self):
+        
+        cls = AttributeAuthorityTestCase
+        aa = self._createAttributeAuthorityHelper()
+        
         self.assert_(aa)
-        self.assert_(aa.assertionLifetime == float(assertionLifetime))
-        self.assert_(aa.issuerName == issuerName)
+        
+        # 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))
 
-
+    def test03Pickle(self):
+        # Test pickling with __slots__
+        aa = self._createAttributeAuthorityHelper()        
+        jar = pickle.dumps(aa)
+        aa2 = pickle.loads(jar)
+        
+        self.assert_(aa2)
+        self.assert_(aa2.assertionLifetime == aa.assertionLifetime)
+        self.assert_(aa2.issuerName == aa.issuerName)
+        self.assert_(isinstance(aa2.attributeInterface, AttributeInterface))
+    
+        
 class SQLAlchemyAttributeInterfaceTestCase(BaseTestCase):
     THIS_DIR = THIS_DIR

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

@@ -20 +20 @@
 from ndg.saml.common.xml import SAMLConstants
 from ndg.saml.xml.etree import AttributeQueryElementTree, ResponseElementTree
-from ndg.saml.saml2.core import (Subject, Issuer, Attribute, NameID, AttributeQuery,
-                             StatusCode, XSStringAttributeValue, )
+from ndg.saml.saml2.core import (Subject, Issuer, Attribute, NameID, 
+                                 AttributeQuery, StatusCode, 
+                                 XSStringAttributeValue)
 
 from ndg.security.common.saml_utils.binding.soap import SOAPBinding
@@ -37 +38 @@
                                         AttributeAuthorityClientBaseTestCase):
     """NDG Attribute Authority SAML SOAP Binding client unit tests"""
+    HERE_DIR = os.path.dirname(__file__)
     CONFIG_FILENAME = 'test_samlattributeauthorityclient.cfg'
-    CONFIG_FILEPATH = os.path.join(os.environ['NDGSEC_AACLNT_UNITTEST_DIR'],
-                                   CONFIG_FILENAME)
+    CONFIG_FILEPATH = os.path.join(HERE_DIR, CONFIG_FILENAME)
     
     def __init__(self, *arg, **kw):