You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2016/02/18 06:56:42 UTC
[2/2] hbase git commit: HBASE-15270 Use appropriate encoding for
"filter" field in TaskMonitorTmpl.jamon.
HBASE-15270 Use appropriate encoding for "filter" field in TaskMonitorTmpl.jamon.
Signed-off-by: chenheng <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bba4f107
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bba4f107
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bba4f107
Branch: refs/heads/master
Commit: bba4f107c19b92eb51c7772eddb408397bea3002
Parents: c7eb72a
Author: Samir Ahmic <sa...@personal.com>
Authored: Tue Feb 16 12:04:37 2016 +0100
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Feb 17 23:55:38 2016 -0600
----------------------------------------------------------------------
.../hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bba4f107/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
index b4a5fea..c3c5d61 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
@@ -20,12 +20,22 @@ limitations under the License.
java.util.*;
org.apache.hadoop.hbase.monitoring.*;
org.apache.hadoop.util.StringUtils;
+org.owasp.esapi.ESAPI;
+org.owasp.esapi.errors.EncodingException;
</%import>
<%args>
TaskMonitor taskMonitor = TaskMonitor.get();
String filter = "general";
String format = "html";
</%args>
+<%class>
+ public String encodeFilter() {
+ try {
+ return ESAPI.encoder().encodeForURL(filter);
+ }catch(EncodingException e) {}
+ return ESAPI.encoder().encodeForHTML(filter);
+ }
+</%class>
<%java>
List<? extends MonitoredTask> tasks = taskMonitor.getTasks();
Iterator<? extends MonitoredTask> iter = tasks.iterator();
@@ -62,7 +72,7 @@ boolean first = true;
<li <%if filter.equals("handler")%>class="active"</%if>><a href="?filter=handler">Show All RPC Handler Tasks</a></li>
<li <%if filter.equals("rpc")%>class="active"</%if>><a href="?filter=rpc">Show Active RPC Calls</a></li>
<li <%if filter.equals("operation")%>class="active"</%if>><a href="?filter=operation">Show Client Operations</a></li>
- <li><a href="?format=json&filter=<% filter %>">View as JSON</a></li>
+ <li><a href="?format=json&filter=<% encodeFilter() %>">View as JSON</a></li>
</ul>
<%if tasks.isEmpty()%>
<p>No tasks currently running on this node.</p>