Changeset 6752 for TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py

Timestamp:

19/03/10 10:39:33 (11 years ago)

Author:

pjkersha

Message:

Added parsing for Resource type and also a reader factory to return the reader class for a given XACML type.

File:

• TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py (modified) (5 diffs)

TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py

@@ -17 +17 @@
 from ndg.xacml.parsers.etree import QName
 from ndg.xacml.parsers.etree.reader import ETreeAbstractReader
-from ndg.xacml.parsers.etree.targetreader import TargetReader
-from ndg.xacml.parsers.etree.rulereader import RuleReader
+from ndg.xacml.parsers.etree.factory import ReaderFactory
     
     
@@ -32 +31 @@
         
         # XACML type to instantiate
-        cls = PolicyReader.TYPE
-        policy = cls()
+        xacmlType = PolicyReader.TYPE
+        policy = xacmlType()
         
         localName = QName.getLocalPart(elem.tag)
-        if localName != cls.ELEMENT_LOCAL_NAME:
+        if localName != xacmlType.ELEMENT_LOCAL_NAME:
             raise XMLParseError("No \"%s\" element found" % 
-                                cls.ELEMENT_LOCAL_NAME)
+                                xacmlType.ELEMENT_LOCAL_NAME)
         
         # Unpack *required* attributes from top-level element
         attributeValues = []
-        for attributeName in (cls.POLICY_ID_ATTRIB_NAME,
-                              cls.RULE_COMBINING_ALG_ID_ATTRIB_NAME):
+        for attributeName in (xacmlType.POLICY_ID_ATTRIB_NAME,
+                              xacmlType.RULE_COMBINING_ALG_ID_ATTRIB_NAME):
             attributeValue = elem.attrib.get(attributeName)
             if attributeValue is None:
@@ -49 +48 @@
                                         'element' %
                                         (attributeName,
-                                         cls.ELEMENT_LOCAL_NAME))
+                                         xacmlType.ELEMENT_LOCAL_NAME))
                 
             attributeValues.append(attributeValue) 
@@ -57 +56 @@
         # Defaults to XACML version 1.0
         # TODO: version check
-        policy.version = (elem.attrib.get(cls.VERSION_ATTRIB_NAME) or 
-                          cls.DEFAULT_XACML_VERSION)
+        policy.version = (elem.attrib.get(xacmlType.VERSION_ATTRIB_NAME) or 
+                          xacmlType.DEFAULT_XACML_VERSION)
             
         # Parse sub-elements
@@ -64 +63 @@
             localName = QName.getLocalPart(childElem.tag)
             
-            if localName == cls.DESCRIPTION_LOCAL_NAME:
+            if localName == xacmlType.DESCRIPTION_LOCAL_NAME:
                 if childElem.text is not None:
                     policy.description = childElem.text.strip()
                     
-            elif localName == cls.POLICY_DEFAULTS_LOCAL_NAME:
+            elif localName == xacmlType.POLICY_DEFAULTS_LOCAL_NAME:
                 raise NotImplementedError()
                    
             elif localName == Target.ELEMENT_LOCAL_NAME:
+                TargetReader = ReaderFactory.getReader(Target)
                 policy.target = TargetReader.parse(childElem)
              
-            elif localName == cls.COMBINER_PARAMETERS_LOCAL_NAME:
+            elif localName == xacmlType.COMBINER_PARAMETERS_LOCAL_NAME:
                 raise NotImplementedError()
              
-            elif localName == cls.RULE_COMBINER_PARAMETERS_LOCAL_NAME:
+            elif localName == xacmlType.RULE_COMBINER_PARAMETERS_LOCAL_NAME:
                 raise NotImplementedError()
             
             elif localName == VariableDefinition.ELEMENT_LOCAL_NAME:
+                VariableDefinitionReader = ReaderFactory.getReader(
+                                                            VariableDefinition)
                 variableDefinition = VariableDefinitionReader.parse(childElem)
                 
             elif localName == Rule.ELEMENT_LOCAL_NAME:
+                RuleReader = ReaderFactory.getReader(Rule)
                 policy.rules.append(RuleReader.parse(childElem))
                    
-            elif localName == cls.OBLIGATIONS_LOCAL_NAME:
+            elif localName == xacmlType.OBLIGATIONS_LOCAL_NAME:
                 raise NotImplementedError()