Changeset 6579 for TI12-security

Timestamp:

16/02/10 16:14:17 (10 years ago)

Author:

pjkersha

Message:

• Fix to Conditions notOnOrAfter property
• Fix to Request types to explicitly call super init methods to initialise attributes/
• Fix decision type serialization for AuthzDecisionStatement?

Location:

TI12-security/trunk/ndg_security_saml/saml

Files:

• saml2/core.py (modified) (9 diffs)
• xml/etree.py (modified) (1 diff)

TI12-security/trunk/ndg_security_saml/saml/saml2/core.py

@@ -961 +961 @@
         @return: the date/time on, or after, which the assertion is invalid'
         '''
-        return self.__notBefore
+        return self.__notOnOrAfter
     
     def _setNotOnOrAfter(self, value):
@@ -980 +980 @@
                             doc="Not on or after time restriction")
 
-    def _getConditions(self):
-        '''Gets all the conditions on the assertion.
+    @property
+    def conditions(self):
+        '''All the conditions on the assertion.
         
         @return: all the conditions on the assertion
         '''
         return self.__conditions
-    
-    conditions = property(fget=_getConditions,
-                          doc="List of conditions")
     
     def _getAudienceRestrictions(self):
@@ -1835 +1833 @@
 
     def _setNamespace(self, value):
-        '''
-        Sets the namespace scope of the specified value.
+        '''Sets the namespace scope of the specified value.
         
         @param value: the namespace scope of the specified value
@@ -1847 +1844 @@
             raise AttributeError('"namespace" action type %r not recognised. '
                                  'It must be one of these action types: %r' % 
-                                 self.__actionNsIdentifiers)
+                                 self.__actionTypes.keys())
             
         self.__namespace = value
@@ -1854 +1851 @@
 
     def _getValue(self):
-        '''
-        gets the URI of the action to be performed.
+        '''gets the URI of the action to be performed.
         
         @return: the URI of the action to be performed
@@ -1862 +1858 @@
 
     def _setValue(self, value):
-        '''
-        Sets the URI of the action to be performed.
+        '''Sets the URI of the action to be performed.
         
         @param value: the URI of the value to be performed
@@ -2116 +2111 @@
     
     def __init__(self):
+        super(SubjectQuery, self).__init__()
         self.__subject = None
         
@@ -2159 +2155 @@
     
     def __init__(self):
+        super(AttributeQuery, self).__init__()
         self.__attributes = TypedList(Attribute)
  
@@ -2420 +2417 @@
     )
     
-    def __init__(self, 
-                 normalizeResource=True, 
-                 safeNormalizationChars='/%',
-                 **kw):
+    def __init__(self, normalizeResource=True, safeNormalizationChars='/%'):
         '''Create new authorisation decision query
         '''
-        super(AuthzDecisionQuery, self).__init__(**kw)
+        super(AuthzDecisionQuery, self).__init__()
 
         # Resource attribute value. 

TI12-security/trunk/ndg_security_saml/saml/xml/etree.py

@@ -559 +559 @@
               
         attrib = {
-            cls.DECISION_ATTRIB_NAME: authzDecisionStatement.decision,
+            cls.DECISION_ATTRIB_NAME: str(authzDecisionStatement.decision),
             cls.RESOURCE_ATTRIB_NAME: authzDecisionStatement.resource
         }