Changeset 7324

Timestamp:

13/08/10 15:20:05 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• adding in functionality for call out to PIP via context handler from Subject Attribute Designator

Location:

TI12-security/trunk/ndg_xacml/ndg/xacml

Files:

• core/attributedesignator.py (modified) (1 diff)
• core/attributevalue.py (modified) (2 diffs)
• utils/__init__.py (modified) (1 diff)

TI12-security/trunk/ndg_xacml/ndg/xacml/core/attributedesignator.py

@@ -183 +183 @@
                 # added to the bag.
                 attributeValues = context.ctxHandler.pipQuery(context, self)
-                attributeValueBag.extend(attributeValues)
+                if attributeValues is not None:
+                    attributeValueBag.extend(attributeValues)
                     
         if len(attributeValueBag) == 0 and self.mustBePresent:

TI12-security/trunk/ndg_xacml/ndg/xacml/core/attributevalue.py

@@ -108 +108 @@
     __slots__ = ('__value',) 
     
-    def __init__(self):
-        """Derived classes must override setting TYPE class variable"""
+    def __init__(self, value=None):
+        """Derived classes must override setting TYPE class variable
+        
+        @param value: initialise the attribute value by setting this keyword
+        @type value: (set by self.__class__.TYPE)
+        """
         
         super(AttributeValue, self).__init__()
@@ -120 +124 @@
         # Allow derived classes to make an implicit data type setting
         self.dataType = self.__class__.IDENTIFIER
+        
+        if value is not None:
+            self.value = value
 
     def __repr__(self):

TI12-security/trunk/ndg_xacml/ndg/xacml/utils/__init__.py

@@ -245 +245 @@
         else:
             return None
-            
-
-    
+          
+    def __repr__(self):
+        return repr(self.__map)
+    
+    def keys(self):
+        return self.__map.keys()
+    
+    def items(self):
+        return self.__map.items()
+    
+    def values(self):
+        return self.__map.values()
+    
+    def __contains__(self, val):
+        return self.__map.__contains__(val)
+