Repository: hbase Updated Branches: refs/heads/branch-1.3 1ecf99ecf -> 232640d3b
HBASE-17558 ZK dumping jsp should escape HTML. Signed-off-by: Enis Soztutar <e...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/232640d3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/232640d3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/232640d3 Branch: refs/heads/branch-1.3 Commit: 232640d3bd3aad84b29b29dd450ab78d817ec427 Parents: 1ecf99e Author: Sean Busbey <bus...@cloudera.com> Authored: Thu Feb 9 18:29:32 2017 -0800 Committer: Sean Busbey <bus...@apache.org> Committed: Tue Feb 14 00:44:48 2017 -0500 ---------------------------------------------------------------------- hbase-server/src/main/resources/hbase-webapps/master/zk.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/232640d3/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index 0649554..3138487 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -18,6 +18,7 @@ */ --%> <%@ page contentType="text/html;charset=UTF-8" + import="org.apache.commons.lang.StringEscapeUtils" import="org.apache.hadoop.hbase.zookeeper.ZKUtil" import="org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher" import="org.apache.hadoop.hbase.HBaseConfiguration" @@ -80,7 +81,7 @@ </div> <div class="row"> <div class="span12"> - <pre><%= ZKUtil.dump(watcher).trim() %></pre> + <pre><%= StringEscapeUtils.escapeHtml(ZKUtil.dump(watcher).trim()) %></pre> </div> </div> </div>
