You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/12/11 21:56:18 UTC
[1/6] accumulo git commit: ACCUMULO-4534 Disable external entities in
SAX parser
Repository: accumulo
Updated Branches:
refs/heads/1.7 47b57f730 -> 3bd701b88
refs/heads/1.8 037c1384a -> 5a11a021f
refs/heads/master 3dc9b373d -> 315ccd921
ACCUMULO-4534 Disable external entities in SAX parser
Closes apache/accumulo#192
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bd701b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bd701b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bd701b8
Branch: refs/heads/1.7
Commit: 3bd701b883492f06766631af30e7b08f14d3454c
Parents: 47b57f7
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 8 22:44:09 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:15:39 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bd701b8/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 8da1ce9..b30ccfb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -118,6 +118,9 @@ public class RestoreZookeeper {
}
SAXParserFactory factory = SAXParserFactory.newInstance();
+ // Prevent external entities by failing on any doctypes. We don't expect any doctypes, so this
+ // is a simple switch to remove any chance of external entities causing problems.
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
SAXParser parser = factory.newSAXParser();
parser.parse(in, new Restore(ZooReaderWriter.getInstance(), opts.overwrite));
in.close();
[3/6] accumulo git commit: ACCUMULO-4534 Disable external entities in
SAX parser
Posted by el...@apache.org.
ACCUMULO-4534 Disable external entities in SAX parser
Closes apache/accumulo#192
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bd701b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bd701b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bd701b8
Branch: refs/heads/master
Commit: 3bd701b883492f06766631af30e7b08f14d3454c
Parents: 47b57f7
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 8 22:44:09 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:15:39 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bd701b8/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 8da1ce9..b30ccfb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -118,6 +118,9 @@ public class RestoreZookeeper {
}
SAXParserFactory factory = SAXParserFactory.newInstance();
+ // Prevent external entities by failing on any doctypes. We don't expect any doctypes, so this
+ // is a simple switch to remove any chance of external entities causing problems.
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
SAXParser parser = factory.newSAXParser();
parser.parse(in, new Restore(ZooReaderWriter.getInstance(), opts.overwrite));
in.close();
[6/6] accumulo git commit: Merge branch '1.8'
Posted by el...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/315ccd92
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/315ccd92
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/315ccd92
Branch: refs/heads/master
Commit: 315ccd921cd72409a2eb11fad5c2b045e43567de
Parents: 3dc9b37 5a11a02
Author: Josh Elser <el...@apache.org>
Authored: Sun Dec 11 16:45:22 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:45:22 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/315ccd92/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
[5/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by el...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a11a021
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a11a021
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a11a021
Branch: refs/heads/1.8
Commit: 5a11a021f65330e316699f42a6df7eba3b63cd53
Parents: 037c138 3bd701b
Author: Josh Elser <el...@apache.org>
Authored: Sun Dec 11 16:16:06 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:16:06 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[4/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by el...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a11a021
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a11a021
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a11a021
Branch: refs/heads/master
Commit: 5a11a021f65330e316699f42a6df7eba3b63cd53
Parents: 037c138 3bd701b
Author: Josh Elser <el...@apache.org>
Authored: Sun Dec 11 16:16:06 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:16:06 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[2/6] accumulo git commit: ACCUMULO-4534 Disable external entities in
SAX parser
Posted by el...@apache.org.
ACCUMULO-4534 Disable external entities in SAX parser
Closes apache/accumulo#192
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bd701b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bd701b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bd701b8
Branch: refs/heads/1.8
Commit: 3bd701b883492f06766631af30e7b08f14d3454c
Parents: 47b57f7
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 8 22:44:09 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sun Dec 11 16:15:39 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bd701b8/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 8da1ce9..b30ccfb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -118,6 +118,9 @@ public class RestoreZookeeper {
}
SAXParserFactory factory = SAXParserFactory.newInstance();
+ // Prevent external entities by failing on any doctypes. We don't expect any doctypes, so this
+ // is a simple switch to remove any chance of external entities causing problems.
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
SAXParser parser = factory.newSAXParser();
parser.parse(in, new Restore(ZooReaderWriter.getInstance(), opts.overwrite));
in.close();