Author: jfclere
Date: Mon Jan 10 16:43:40 2011
New Revision: 1057270
URL: http://svn.apache.org/viewvc?rev=1057270&view=rev
Log:
filter input of manager app servlets
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057270&r1=1057269&r2=1057270&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Mon Jan 10 16:43:40 2011
@@ -407,10 +407,11 @@ public final class HTMLManagerServlet ex
args = new Object[7];
args[0] = URL_ENCODER.encode(displayPath);
- args[1] = displayPath;
- args[2] = context.getDisplayName();
- if (args[2] == null) {
+ args[1] = RequestUtil.filter(displayPath);
+ if (context.getDisplayName() == null) {
args[2] = " ";
+ } else {
+ args[2] = RequestUtil.filter(context.getDisplayName());
}
args[3] = new Boolean(context.getAvailable());
args[4] = response.encodeURL
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1057270&r1=1057269&r2=1057270&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
Mon Jan 10 16:43:40 2011
@@ -575,7 +575,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>");
@@ -650,7 +650,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1057270&r1=1057269&r2=1057270&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 10 16:43:40 2011
@@ -47,6 +47,9 @@
<subsection name="General">
<changelog>
<fix>
+ filter input of manager app servlets. (kkolinko)
+ </fix>
+ <fix>
<bug>43960</bug>: Expose available property of StandardWrapper via JMX.
(markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
