Changeset 7256

Timestamp:

29/07/10 21:29:29 (9 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• Important fix to equal function base class in ndg.xacml.core.functions.v1.equal. Type checking was incorrect.

Location:

TI12-security/trunk/ndg_xacml/ndg/xacml/core

Files:

• context/handler.py (modified) (2 diffs)
• context/pdp.py (modified) (1 diff)
• context/pip.py (modified) (1 diff)
• context/pipinterface.py (added)
• functions/v1/equal.py (modified) (1 diff)

TI12-security/trunk/ndg_xacml/ndg/xacml/core/context/handler.py

@@ -11 +11 @@
 __revision__ = "$Id$"
 from abc import ABCMeta, abstractmethod
+
+from ndg.xacml.core.context.pdpinterface import PDPInterface
+from ndg.xacml.core.context.pipinterface import PIPInterface
 
 
@@ -52 +55 @@
         """
         return []
+    
+
+class CtxHandlerBase(CtxHandlerInterface):
+    """Base class for Context handlers - extends Context handler interface to 
+    include Policy Decision Point and Policy Information Point references
+    """
+    
+    __slots__ = (
+        '__pip',
+        '__pdp', 
+    )
+      
+    def __init__(self):
+        self.__pip = None
+        self.__pdp = None
         
+    def _getPip(self):
+        return self.__pip
+
+    def _setPip(self, value):
+        if not isinstance(value, PIPInterface):
+            raise TypeError('Expecting %r type for "pip" attribute; got %r '
+                            'instead' % 
+                            (PDPInterface, value))
+            
+        self.__pip = value
+
+    pip = property(_getPip, _setPip, None, "Policy Information Point")
+          
+    def _getPdp(self):
+        return self.__pdp
+
+    def _setPdp(self, value):
+        if not isinstance(value, PDPInterface):
+            raise TypeError('Expecting %r type for "pdp" attribute; got %r '
+                            'instead' % 
+                            (PDPInterface, value))
+            
+        self.__pdp = value
+
+    pdp = property(_getPdp, _setPdp, None, "Policy Decision Point")
+        

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

@@ -48 +48 @@
         """           
         pdp = cls()
-        pdp.policy = Policy.fromSource(source, readerFactory)
+        pdp.setPolicyFromSource(source, readerFactory)
         return pdp
     
+    def setPolicyFromSource(self, source, readerFactory):
+        """initialise PDP with the given policy
+        @param source: source for policy
+        @type source: type (dependent on the reader set, it could be for example
+        a file path string, file object, XML element instance)
+        @param readerFactory: reader factory returns the reader to use to read 
+        this policy
+        @type readerFactory: ndg.xacml.parsers.AbstractReader derived type
+        """           
+        self.policy = Policy.fromSource(source, readerFactory)
+        
     @property
     def policy(self):

TI12-security/trunk/ndg_xacml/ndg/xacml/core/context/pip.py

@@ -1 @@
-"""NDG Security Policy Information Point type definition
+"""NDG XACML Policy Information Point type definition
 
-NERC DataGrid
 """
 __author__ = "P J Kershaw"

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

@@ -23 +23 @@
     TYPE = None
     
-    def evaluate(self, string1, string2):
-        """Match input strings
+    def evaluate(self, attribute1, attribute2):
+        """Match input attribute values
         
-        @param string1: first of two strings to match
-        @type string1: basestring
-        @param string2: second string
-        @type string2: basestring
-        @return: True if strings match, False otherwise
+        @param attribute1: first of two attributes to match
+        @type attribute1: ndg.xacml.core.attributevalue.AttributeValue derived
+        @param attribute2: second attribute
+        @type attribute2: ndg.xacml.core.attributevalue.AttributeValue derived
+        @return: True if attributes match, False otherwise
         @rtype: bool
         """
-        if not isinstance(string1, basestring):
+        if not isinstance(attribute1, self.__class__.TYPE):
             raise XacmlContextTypeError('Expecting %r derived type for '
-                                        '"string1"; got %r' %
+                                        '"attribute1"; got %r' %
                                         (self.__class__.TYPE, 
-                                         type(string1)))
+                                         type(attribute1)))
             
-        if not isinstance(string2, self.__class__.TYPE):
+        if not isinstance(attribute2, self.__class__.TYPE):
             raise XacmlContextTypeError('Expecting %r derived type for '
-                                        '"string2"; got %r' %
+                                        '"attribute2"; got %r' %
                                         (self.__class__.TYPE, 
-                                         type(string2)))
+                                         type(attribute2)))
             
-        return string1 == string2
+        return attribute1.value == attribute2.value