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 07:10:28 UTC
[1/2] hbase git commit: HBASE-15270 Use appropriate encoding for
"filter" field in TaskMonitorTmpl.jamon.
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 87d91e553 -> e3ea7a427
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/e3ea7a42
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e3ea7a42
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e3ea7a42
Branch: refs/heads/branch-1.1
Commit: e3ea7a427e2d62a721a18a991057f1a5b10984ac
Parents: 96c1683
Author: Samir Ahmic <sa...@personal.com>
Authored: Tue Feb 16 12:04:37 2016 +0100
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Thu Feb 18 00:09:56 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/e3ea7a42/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>
[2/2] hbase git commit: Revert "HBASE-15120 Use appropriate encoding
for "filter" field in TaskMonitorTmpl.jamon."
Posted by bu...@apache.org.
Revert "HBASE-15120 Use appropriate encoding for "filter" field in TaskMonitorTmpl.jamon."
This reverts commit efccab1b8eeb096bdaeb55d9efc0b6689327fd6b.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/96c1683e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96c1683e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96c1683e
Branch: refs/heads/branch-1.1
Commit: 96c1683e2f7183e6855e9deb474d942e6b31fd35
Parents: 87d91e5
Author: Sean Busbey <bu...@cloudera.com>
Authored: Thu Feb 18 00:08:59 2016 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Thu Feb 18 00:09:56 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/96c1683e/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>