Author: markt
Date: Mon Jan 10 16:58:10 2011
New Revision: 1057279
URL: http://svn.apache.org/viewvc?rev=1057279&view=rev
Log:
More filtering
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057279&r1=1057278&r2=1057279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Mon
Jan 10 16:58:10 2011
@@ -523,19 +523,21 @@ public final class HTMLManagerServlet ex
}
args = new Object[7];
- args[0] = "<a href=\"" + URL_ENCODER.encode(displayPath) +
- "\">" + displayPath + "</a>";
- args[1] = ctxt.getWebappVersion();
- if ("".equals(args[1])) {
- args[1]= noVersion;
+ args[0] = "<a href=\"" + URL_ENCODER.encode(displayPath)
+ + "\">" + RequestUtil.filter(displayPath) + "</a>";
+ if ("".equals(ctxt.getWebappVersion())) {
+ args[1] = noVersion;
+ } else {
+ args[1] = RequestUtil.filter(ctxt.getWebappVersion());
}
- args[2] = ctxt.getDisplayName();
- if (args[2] == null) {
+ if (ctxt.getDisplayName() == null) {
args[2] = " ";
+ } else {
+ args[2] = RequestUtil.filter(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getAvailable());
- args[4] = response.encodeURL(request.getContextPath() +
- "/html/sessions?" + pathVersion);
+ args[4] =
RequestUtil.filter(response.encodeURL(request.getContextPath() +
+ "/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
args[5] = Integer.valueOf(
@@ -552,20 +554,20 @@ public final class HTMLManagerServlet ex
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
args = new Object[14];
- args[0] = response.encodeURL(request.getContextPath() +
- "/html/start?" + pathVersion);
+ args[0] = RequestUtil.filter(response.encodeURL(request
+ .getContextPath() + "/html/start?" + pathVersion));
args[1] = appsStart;
- args[2] = response.encodeURL(request.getContextPath() +
- "/html/stop?" + pathVersion);
+ args[2] = RequestUtil.filter(response.encodeURL(request
+ .getContextPath() + "/html/stop?" + pathVersion));
args[3] = appsStop;
- args[4] = response.encodeURL(request.getContextPath() +
- "/html/reload?" + pathVersion);
+ args[4] = RequestUtil.filter(response.encodeURL(request
+ .getContextPath() + "/html/reload?" + pathVersion));
args[5] = appsReload;
- args[6] = response.encodeURL(request.getContextPath() +
- "/html/undeploy?" + pathVersion);
+ args[6] = RequestUtil.filter(response.encodeURL(request
+ .getContextPath() + "/html/undeploy?" + pathVersion));
args[7] = appsUndeploy;
- args[8] = response.encodeURL(request.getContextPath() +
- "/html/expire?" + pathVersion);
+ args[8] = RequestUtil.filter(response.encodeURL(request
+ .getContextPath() + "/html/expire?" + pathVersion));
args[9] = appsExpire;
args[10] = smClient.getString(
"htmlManagerServlet.expire.explain");
Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1057279&r1=1057278&r2=1057279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Mon
Jan 10 16:58:10 2011
@@ -572,7 +572,7 @@ public class StatusTransformer {
}
writer.print("<a href=\"#" + (count++) + ".0\">");
- writer.print(webModuleName);
+ writer.print(filter(webModuleName));
writer.print("</a>");
if (iterator.hasNext()) {
writer.print("<br>");
@@ -649,7 +649,7 @@ public class StatusTransformer {
}
writer.print("<h1>");
- writer.print(name);
+ writer.print(filter(name));
writer.print("</h1>");
writer.print("</a>");
@@ -778,11 +778,11 @@ public class StatusTransformer {
mBeanServer.invoke(objectName, "findMappings", null, null);
writer.print("<h2>");
- writer.print(servletName);
+ writer.print(filter(servletName));
if ((mappings != null) && (mappings.length > 0)) {
writer.print(" [ ");
for (int i = 0; i < mappings.length; i++) {
- writer.print(mappings[i]);
+ writer.print(filter(mappings[i]));
if (i < mappings.length - 1) {
writer.print(" , ");
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1057279&r1=1057278&r2=1057279&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 10 16:58:10 2011
@@ -314,6 +314,9 @@
<bug>50488</bug>: Update classpath required when using jsvc and add a
note regarding server VMs. (markt)
</fix>
+ <fix>
+ Further filtering of Manager and Host Manager display output.
(kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
