Repository: ranger Updated Branches: refs/heads/ranger-0.7 af035198c -> 991142992
RANGER-1531: Good coding practice while parsing XML documents in Ranger - 0.7 branch Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/99114299 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/99114299 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/99114299 Branch: refs/heads/ranger-0.7 Commit: 9911429927df041cd9f193ee7052d2eb8e7e6207 Parents: af03519 Author: Sailaja Polavarapu <spolavar...@hortonworks.com> Authored: Thu Apr 20 14:45:16 2017 -0700 Committer: Sailaja Polavarapu <spolavar...@hortonworks.com> Committed: Thu Apr 20 14:45:16 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/ranger/utils/install/XmlConfigChanger.java | 1 + .../src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/99114299/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java ---------------------------------------------------------------------- diff --git a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java index 8fee099..d0f3099 100644 --- a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java +++ b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java @@ -280,6 +280,7 @@ public class XmlConfigChanger { } TransformerFactory tfactory = TransformerFactory.newInstance(); + tfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); Transformer transformer = tfactory.newTransformer(); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); http://git-wip-us.apache.org/repos/asf/ranger/blob/99114299/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java index 29fc78a..eeb2928 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; +import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -45,6 +46,7 @@ public class XMLPropertiesUtil extends DefaultPropertiesPersister { try { DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory .newInstance(); + xmlDocumentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); xmlDocumentBuilderFactory.setIgnoringComments(true); xmlDocumentBuilderFactory.setNamespaceAware(true); DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory