You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2017/04/24 18:23:53 UTC

ranger git commit: RANGER-1531: added code to not allow external entities as part of XML parsing -- ranger-0.7 branch

Repository: ranger
Updated Branches:
  refs/heads/ranger-0.7 7665dcfd7 -> da8ba041b


RANGER-1531: added code to not allow external entities as part of XML parsing -- 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/da8ba041
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/da8ba041
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/da8ba041

Branch: refs/heads/ranger-0.7
Commit: da8ba041b72e0caee90378ddcd08e122b6ce6ecc
Parents: 7665dcf
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Mon Apr 24 11:23:51 2017 -0700
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Mon Apr 24 11:23:51 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/ranger/utils/install/XmlConfigChanger.java     | 2 ++
 .../src/main/java/org/apache/ranger/common/RangerProperties.java   | 2 ++
 .../src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java  | 2 ++
 .../org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java | 2 ++
 .../apache/ranger/authentication/UnixAuthenticationService.java    | 2 ++
 5 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/da8ba041/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 d0f3099..764404c 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
@@ -168,6 +168,8 @@ public class XmlConfigChanger {
 		
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+		factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		doc = builder.parse(inpFile);
 		

http://git-wip-us.apache.org/repos/asf/ranger/blob/da8ba041/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
index 5dca497..5f5eb10 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
@@ -83,6 +83,8 @@ public class RangerProperties extends  HashMap<String,String>  {
 
 			DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
 					.newInstance();
+			xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                        xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 			xmlDocumentBuilderFactory.setIgnoringComments(true);
 			xmlDocumentBuilderFactory.setNamespaceAware(true);
 			DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory

http://git-wip-us.apache.org/repos/asf/ranger/blob/da8ba041/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 eeb2928..d4bca31 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
@@ -47,6 +47,8 @@ public class XMLPropertiesUtil extends DefaultPropertiesPersister {
 			DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
 					.newInstance();
 			xmlDocumentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+			xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                        xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 			xmlDocumentBuilderFactory.setIgnoringComments(true);
 			xmlDocumentBuilderFactory.setNamespaceAware(true);
 			DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory

http://git-wip-us.apache.org/repos/asf/ranger/blob/da8ba041/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index ba1b90d..fc239af 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -270,6 +270,8 @@ public class UserGroupSyncConfig  {
 					//					prop.load(in);
 					DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
 							.newInstance();
+					xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                                        xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 					xmlDocumentBuilderFactory.setIgnoringComments(true);
 					xmlDocumentBuilderFactory.setNamespaceAware(true);
 					DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory

http://git-wip-us.apache.org/repos/asf/ranger/blob/da8ba041/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
index 6742f95..3b018de 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
@@ -153,6 +153,8 @@ public class UnixAuthenticationService {
 			if (in != null) {
 				try {
 					DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
+					xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                        		xmlDocumentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 					xmlDocumentBuilderFactory.setIgnoringComments(true);
 					xmlDocumentBuilderFactory.setNamespaceAware(true);
 					DocumentBuilder xmlDocumentBuilder = xmlDocumentBuilderFactory.newDocumentBuilder();