Repository: hbase Updated Branches: refs/heads/branch-1.2 33911c5ed -> c74bf5a32
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/c74bf5a3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c74bf5a3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c74bf5a3 Branch: refs/heads/branch-1.2 Commit: c74bf5a324ce51a139cbd4d1548c8207480ef0cf Parents: 33911c5 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:55:45 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/c74bf5a3/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 036d650..a1371ad 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" @@ -79,7 +80,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>
