Repository: hbase Updated Branches: refs/heads/branch-1.2 e610655e5 -> bbb4e60da
Revert "HBASE-15120 Use appropriate encoding for "filter" field in TaskMonitorTmpl.jamon." This reverts commit 5533550156b627da905b04702887245c2d505307. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1cee806c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1cee806c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1cee806c Branch: refs/heads/branch-1.2 Commit: 1cee806c0414f4de413adf82cc485028c3814d8f Parents: e610655 Author: Sean Busbey <[email protected]> Authored: Thu Feb 18 00:07:25 2016 -0600 Committer: Sean Busbey <[email protected]> Committed: Thu Feb 18 00:07:25 2016 -0600 ---------------------------------------------------------------------- .../hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1cee806c/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 c3c5d61..b4a5fea 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,22 +20,12 @@ 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(); @@ -72,7 +62,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=<% encodeFilter() %>">View as JSON</a></li> + <li><a href="?format=json&filter=<% filter %>">View as JSON</a></li> </ul> <%if tasks.isEmpty()%> <p>No tasks currently running on this node.</p>
