Changeset 7668 for TI12-security/trunk/ndg_xacml

Timestamp:

28/10/10 16:39:24 (10 years ago)

Author:

pjkersha

Message:

Modified apply and match classes to use a FunctionMap? class singleton to enable easy addition of new function types.

Location:

TI12-security/trunk/ndg_xacml/ndg/xacml

Files:

• core/apply.py (modified) (2 diffs)
• core/functions/__init__.py (modified) (2 diffs)
• core/match.py (modified) (2 diffs)
• test/context/test_pdp_with_custom_attributevalue_types.py (modified) (2 diffs)
• test/test_functions.py (modified) (1 diff)

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

@@ -12 +12 @@
 from ndg.xacml.utils import TypedList
 from ndg.xacml.core.expression import Expression
-from ndg.xacml.core.functions import (FunctionMap, UnsupportedStdFunctionError,
+from ndg.xacml.core.functions import (FunctionMap, functionMap,
+                                      UnsupportedStdFunctionError,
                                       UnsupportedFunctionError)
 
@@ -53 +54 @@
         self.__functionId = None
         self.__function = None
-        self.__functionMap = FunctionMap()
+        self.__functionMap = functionMap
         self.__loadFunctionFromId = True
         self.__expressions = TypedList(Expression)

TI12-security/trunk/ndg_xacml/ndg/xacml/core/functions/__init__.py

@@ -598 +598 @@
         return True 
            
-    def loadAll(self):
-        """Load function map with implementations from the relevant function
-        package"""
+    def loadAllCore(self):
+        """Load all core XACML functions"""
         
         for functionNs in XacmlFunctionNames.FUNCTION_NAMES:
@@ -698 +697 @@
             return functionClass
 
-
-        
+# Function map singleton used by match and apply classes - add new keys to
+# this dictionary to enable support for custom functions
+functionMap = FunctionMap()
+        

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

@@ -17 +17 @@
 from ndg.xacml.core.attributedesignator import AttributeDesignator
 from ndg.xacml.core.attributeselector import AttributeSelector
-from ndg.xacml.core.functions import (FunctionMap, UnsupportedStdFunctionError,
+from ndg.xacml.core.functions import (FunctionMap, functionMap,
+                                      UnsupportedStdFunctionError,
                                       UnsupportedFunctionError)
 from ndg.xacml.core.context.exceptions import XacmlContextError
@@ -82 +83 @@
         
         self.__function = None
-        self.__functionMap = FunctionMap()
+        self.__functionMap = functionMap
         self.__loadFunctionFromId = True
         

TI12-security/trunk/ndg_xacml/ndg/xacml/test/context/test_pdp_with_custom_attributevalue_types.py

@@ -19 +19 @@
 from ndg.xacml.core.attribute import Attribute
 from ndg.xacml.core.attributevalue import AttributeValueClassFactory
-
+from ndg.xacml.core.functions import functionMap
+from ndg.xacml.core.functions.v1.bag import BagBase
+from ndg.xacml.core.functions.v1.at_least_one_member_of import \
+    AtLeastOneMemberOfBase 
 from ndg.xacml.core.context.request import Request
 from ndg.xacml.core.context.subject import Subject
 from ndg.xacml.core.context.resource import Resource
 from ndg.xacml.core.context.action import Action
+
 from ndg.xacml.parsers.etree.factory import ReaderFactory
 from ndg.xacml.parsers.etree.attributevaluereader import (
@@ -116 +120 @@
                                 ETreeGroupRoleDataTypeReader)
         
+        # Add extra matching and bag functions
+        
         # Example policy with custom attribute value type used with ESGF 
         self.pdp = PDP.fromPolicySource(XACML_ESGFTEST1_FILEPATH, ReaderFactory)

TI12-security/trunk/ndg_xacml/ndg/xacml/test/test_functions.py

@@ -28 +28 @@
     def test01LoadMap(self):   
         funcMap = FunctionMap()
-        funcMap.loadAll()
+        funcMap.loadAllCore()
         anyUriMatchNs = \
             'urn:oasis:names:tc:xacml:2.0:function:anyURI-regexp-match'