Changeset 6734 for TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/xacml/parsers/etree/policyreader.py

Timestamp:

16/03/10 11:56:31 (11 years ago)

Author:

pjkersha

Message:

Added XACML Target ElementTree based parser.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/xacml/parsers/etree/policyreader.py (modified) (4 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/xacml/parsers/etree/policyreader.py

@@ -1 @@
-'''
-Created on 16 Mar 2010
+"""NDG Security XACML ElementTree Policy Reader  
 
-@author: pjkersha
-'''
-from ndg.security.common.authz.xacml.etree.reader import AbstractReader
-from ndg.security.common.authz.xacml import PolicyComponent, XMLParseError
+NERC DataGrid Project
+"""
+__author__ = "P J Kershaw"
+__date__ = "16/03/10"
+__copyright__ = "(C) 2010 Science and Technology Facilities Council"
+__contact__ = "Philip.Kershaw@stfc.ac.uk"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__contact__ = "Philip.Kershaw@stfc.ac.uk"
+__revision__ = "$Id: $"
+from ndg.security.common.authz.xacml.parsers.etree.reader import \
+    EtreeAbstractReader
+from ndg.security.common.authz.xacml import XMLParseError
 from ndg.security.common.authz.xacml.policy import Policy
 from ndg.security.common.authz.xacml.variabledefinition import \
@@ -11 +18 @@
 from ndg.security.common.authz.xacml.rule import Rule
 from ndg.security.common.authz.xacml.target import Target
-from ndg.security.common.authz.xacml.etree import QName
-from ndg.security.common.authz.xacml.etree.targetreader import TargetReader
+from ndg.security.common.authz.xacml.parsers.etree import QName
+from ndg.security.common.authz.xacml.parsers.etree.targetreader import \
+    TargetReader
     
     
-class PolicyReader(AbstractReader):
+class PolicyReader(EtreeAbstractReader):
     """Parse a Policy Document using ElementTree
     """
@@ -62 +70 @@
                    
             elif localName == Target.ELEMENT_LOCAL_NAME:
-                target = TargetReader.parse(childElem)
+                policy.target = TargetReader.parse(childElem)
              
             elif localName == cls.COMBINER_PARAMETERS_LOCAL_NAME:
@@ -74 +82 @@
                 
             elif localName == Rule.ELEMENT_LOCAL_NAME:
-                rule = RuleReader.parse(childElem)
+                policy.rules.append(RuleReader.parse(childElem))
                    
             elif localName == cls.OBLIGATIONS_LOCAL_NAME: