Author: markt Date: Wed Jun 13 19:13:59 2007 New Revision: 547085 URL: http://svn.apache.org/viewvc?view=rev&rev=547085 Log: Port fix for XSS issue in Manager. This is CVE-2007-2450.
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java?view=diff&rev=547085&r1=547084&r2=547085 ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Wed Jun 13 19:13:59 2007 @@ -113,8 +113,7 @@ message = stop(path); } else { message = - sm.getString("managerServlet.unknownCommand", - RequestUtil.filter(command)); + sm.getString("managerServlet.unknownCommand",command); } list(request, response, message); @@ -317,7 +316,11 @@ // Message Section args = new Object[3]; args[0] = sm.getString("htmlManagerServlet.messageLabel"); - args[1] = (message == null || message.length() == 0) ? "OK" : message; + if (message == null || message.length() == 0) { + args[1] = "OK"; + } else { + args[1] = RequestUtil.filter(message); + } writer.print(MessageFormat.format(MESSAGE_SECTION, args)); // Manager Section --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]