Changeset 6780

Timestamp:

26/03/10 14:26:48 (9 years ago)

Author:

pjkersha

Message:

 

Location:

TI12-security/trunk/NDG_XACML/ndg/xacml

Files:

• core/context/pdp.py (modified) (2 diffs)
• core/functions/__init__.py (modified) (1 diff)
• test/test_context.py (modified) (1 diff)
• test/test_matchfunctions.py (modified) (1 diff)
• test/test_policypy (modified) (2 diffs)

TI12-security/trunk/NDG_XACML/ndg/xacml/core/context/pdp.py

@@ -188 +188 @@
                 
                 _attributeMatch = lambda requestChildAttribute: (
-                    matchFunc(matchAttributeValue, 
+                    matchFunc.evaluate(matchAttributeValue, 
                               requestChildAttribute.attributeValue.value) and
                     requestChildAttribute.attributeId == attributeId and
@@ -203 +203 @@
             else:
                 _attributeMatch = lambda requestChildAttribute: (
-                    matchFunc(matchAttributeValue, 
-                              requestChildAttribute.attributeValue.value)
+                    matchFunc.evaluate(matchAttributeValue, 
+                                    requestChildAttribute.attributeValue.value)
                 )
                 

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

@@ -341 +341 @@
                                          'recognised: %r' % functionNs) 
                        
-        # Try importing the function class and loading it into the 
+        # Try instantiating the function class and loading it into the 
         # map
         try:
-            self[functionNs] = callModuleObject(classPath)
+            matchFunctionObj = callModuleObject(classPath)
+            self[functionNs] = matchFunctionObj
         except ImportError:
             # No implementation exists - default to Abstract function

TI12-security/trunk/NDG_XACML/ndg/xacml/test/test_context.py

@@ +1 @@
+#!/usr/bin/env python
 """NDG XACML Context unit test package 
 

TI12-security/trunk/NDG_XACML/ndg/xacml/test/test_matchfunctions.py

@@ +1 @@
+#!/usr/bin/env python
 """NDG XACML functions unit test package 
 

TI12-security/trunk/NDG_XACML/ndg/xacml/test/test_policypy

@@ -1 @@
-"""NDG XACML unit test package 
+#!/usr/bin/env python
+"""NDG XACML Policy unit test package 
 
 NERC DataGrid Project
@@ -63 +64 @@
         self.assert_(len(policy.rules[0].target.environments) == 0)
         
-        self.assert_(len(policy.rules[0].target.subjects[0].subjectMatches) == 1)
+        self.assert_(len(policy.rules[0].target.subjects[0
+                                                         ].subjectMatches) == 1)
         
         self.assert_(policy.rules[0].target.subjects[0].subjectMatches[0