You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/12/20 21:32:39 UTC
svn commit: r1647051 - in /tomcat/trunk/java/org/apache: catalina/connector/
catalina/manager/ catalina/manager/host/ catalina/servlets/ catalina/users/
catalina/util/ catalina/valves/ tomcat/util/http/
Author: markt
Date: Sat Dec 20 20:32:39 2014
New Revision: 1647051
URL: http://svn.apache.org/r1647051
Log:
Remove duplicate utility method.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Dec 20 20:32:39 2014
@@ -45,12 +45,12 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
import org.apache.tomcat.util.http.FastHttpDateFormat;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.MediaTypeCache;
import org.apache.tomcat.util.net.URL;
@@ -1297,7 +1297,7 @@ public class Response
if (getContext().getSendRedirectBody()) {
PrintWriter writer = getWriter();
writer.print(sm.getString("coyoteResponse.sendRedirect.note",
- RequestUtil.filter(absolute)));
+ HttpMessages.filter(absolute)));
flushBuffer();
}
} catch (IllegalArgumentException e) {
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=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sat Dec 20 20:32:39 2014
@@ -49,9 +49,9 @@ import org.apache.catalina.manager.util.
import org.apache.catalina.manager.util.ReverseComparator;
import org.apache.catalina.manager.util.SessionUtils;
import org.apache.catalina.util.ContextName;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -356,7 +356,7 @@ public final class HTMLManagerServlet ex
if (message == null || message.length() == 0) {
args[1] = "OK";
} else {
- args[1] = RequestUtil.filter(message);
+ args[1] = HttpMessages.filter(message);
}
writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
@@ -447,19 +447,19 @@ public final class HTMLManagerServlet ex
args = new Object[7];
args[0] = "<a href=\"" + URL_ENCODER.encode(contextPath + "/")
- + "\">" + RequestUtil.filter(displayPath) + "</a>";
+ + "\">" + HttpMessages.filter(displayPath) + "</a>";
if ("".equals(ctxt.getWebappVersion())) {
args[1] = noVersion;
} else {
- args[1] = RequestUtil.filter(ctxt.getWebappVersion());
+ args[1] = HttpMessages.filter(ctxt.getWebappVersion());
}
if (ctxt.getDisplayName() == null) {
args[2] = " ";
} else {
- args[2] = RequestUtil.filter(ctxt.getDisplayName());
+ args[2] = HttpMessages.filter(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
- args[4] = RequestUtil.filter(response.encodeURL(request.getContextPath() +
+ args[4] = HttpMessages.filter(response.encodeURL(request.getContextPath() +
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager && showProxySessions) {
@@ -477,19 +477,19 @@ public final class HTMLManagerServlet ex
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
args = new Object[14];
- args[0] = RequestUtil.filter(response.encodeURL(request
+ args[0] = HttpMessages.filter(response.encodeURL(request
.getContextPath() + "/html/start?" + pathVersion));
args[1] = appsStart;
- args[2] = RequestUtil.filter(response.encodeURL(request
+ args[2] = HttpMessages.filter(response.encodeURL(request
.getContextPath() + "/html/stop?" + pathVersion));
args[3] = appsStop;
- args[4] = RequestUtil.filter(response.encodeURL(request
+ args[4] = HttpMessages.filter(response.encodeURL(request
.getContextPath() + "/html/reload?" + pathVersion));
args[5] = appsReload;
- args[6] = RequestUtil.filter(response.encodeURL(request
+ args[6] = HttpMessages.filter(response.encodeURL(request
.getContextPath() + "/html/undeploy?" + pathVersion));
args[7] = appsUndeploy;
- args[8] = RequestUtil.filter(response.encodeURL(request
+ args[8] = HttpMessages.filter(response.encodeURL(request
.getContextPath() + "/html/expire?" + pathVersion));
args[9] = appsExpire;
args[10] = smClient.getString(
@@ -829,14 +829,14 @@ public final class HTMLManagerServlet ex
}
throw new IllegalArgumentException(smClient.getString(
"managerServlet.invalidPath",
- RequestUtil.filter(path)));
+ HttpMessages.filter(path)));
}
Context ctxt = (Context) host.findChild(cn.getName());
if (null == ctxt) {
throw new IllegalArgumentException(smClient.getString(
"managerServlet.noContext",
- RequestUtil.filter(cn.getDisplayName())));
+ HttpMessages.filter(cn.getDisplayName())));
}
Manager manager = ctxt.getManager();
List<Session> sessions = new ArrayList<>();
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sat Dec 20 20:32:39 2014
@@ -56,10 +56,10 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.util.ContextName;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.tomcat.util.Diagnostics;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -995,7 +995,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(cn.getDisplayName())));
+ HttpMessages.filter(cn.getDisplayName())));
return;
}
// It isn't possible for the manager to reload itself
@@ -1163,13 +1163,13 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
Manager manager = context.getManager() ;
if(manager == null) {
writer.println(smClient.getString("managerServlet.noManager",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
int maxCount = 60;
@@ -1287,7 +1287,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
context.start();
@@ -1332,7 +1332,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
// It isn't possible for the manager to stop itself
@@ -1379,13 +1379,13 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(name);
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
if (!isDeployed(name)) {
writer.println(smClient.getString("managerServlet.notDeployed",
- RequestUtil.filter(displayPath)));
+ HttpMessages.filter(displayPath)));
return;
}
@@ -1578,7 +1578,7 @@ public class ManagerServlet extends Http
String path = null;
if (cn != null) {
- path = RequestUtil.filter(cn.getPath());
+ path = HttpMessages.filter(cn.getPath());
}
writer.println(sm.getString("managerServlet.invalidPath", path));
return false;
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=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Sat Dec 20 20:32:39 2014
@@ -37,8 +37,8 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.util.RequestUtil;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.http.HttpMessages;
/**
* This is a refactoring of the servlet to externalize
@@ -504,7 +504,7 @@ public class StatusTransformer {
(pName, "currentQueryString");
if ((queryString != null) && (!queryString.equals(""))) {
writer.write("?");
- writer.print(RequestUtil.filter(queryString));
+ writer.print(HttpMessages.filter(queryString));
}
writer.write(" ");
writer.write(filter(mBeanServer.getAttribute
@@ -559,7 +559,7 @@ public class StatusTransformer {
(pName, "currentQueryString");
if ((queryString != null) && (!queryString.equals(""))) {
writer.write(" currentQueryString=\""
- + RequestUtil.filter(queryString) + "\"");
+ + HttpMessages.filter(queryString) + "\"");
} else {
writer.write(" currentQueryString=\"?\"");
}
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Sat Dec 20 20:32:39 2014
@@ -33,8 +33,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.Container;
import org.apache.catalina.Host;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -252,7 +252,7 @@ public final class HTMLHostManagerServle
if (message == null || message.length() == 0) {
args[1] = "OK";
} else {
- args[1] = RequestUtil.filter(message);
+ args[1] = HttpMessages.filter(message);
}
writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
@@ -310,7 +310,7 @@ public final class HTMLHostManagerServle
if (host != null ) {
args = new Object[2];
- args[0] = RequestUtil.filter(hostName);
+ args[0] = HttpMessages.filter(hostName);
String[] aliases = host.findAliases();
StringBuilder buf = new StringBuilder();
if (aliases.length > 0) {
@@ -324,7 +324,7 @@ public final class HTMLHostManagerServle
buf.append(" ");
args[1] = buf.toString();
} else {
- args[1] = RequestUtil.filter(buf.toString());
+ args[1] = HttpMessages.filter(buf.toString());
}
writer.print
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sat Dec 20 20:32:39 2014
@@ -66,9 +66,9 @@ import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.ResponseFacade;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.security.PrivilegedGetTccl;
import org.apache.tomcat.util.security.PrivilegedSetTccl;
@@ -1305,7 +1305,7 @@ public class DefaultServlet extends Http
.append("'");
sb.append(">");
- sb.append(RequestUtil.filter(entry));
+ sb.append(HttpMessages.filter(entry));
if (childResource.isDirectory())
sb.append("/");
sb.append("</entry>");
@@ -1467,7 +1467,7 @@ public class DefaultServlet extends Http
if (childResource.isDirectory())
sb.append("/");
sb.append("\"><tt>");
- sb.append(RequestUtil.filter(entry));
+ sb.append(HttpMessages.filter(entry));
if (childResource.isDirectory())
sb.append("/");
sb.append("</tt></a></td>\r\n");
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Sat Dec 20 20:32:39 2014
@@ -25,7 +25,7 @@ import java.util.Iterator;
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.UserDatabase;
-import org.apache.catalina.util.RequestUtil;
+import org.apache.tomcat.util.http.HttpMessages;
/**
* <p>Concrete implementation of {@link org.apache.catalina.User} for the
@@ -258,13 +258,13 @@ public class MemoryUser extends Abstract
public String toXml() {
StringBuilder sb = new StringBuilder("<user username=\"");
- sb.append(RequestUtil.filter(username));
+ sb.append(HttpMessages.filter(username));
sb.append("\" password=\"");
- sb.append(RequestUtil.filter(password));
+ sb.append(HttpMessages.filter(password));
sb.append("\"");
if (fullName != null) {
sb.append(" fullName=\"");
- sb.append(RequestUtil.filter(fullName));
+ sb.append(HttpMessages.filter(fullName));
sb.append("\"");
}
synchronized (groups) {
@@ -277,7 +277,7 @@ public class MemoryUser extends Abstract
sb.append(',');
}
n++;
- sb.append(RequestUtil.filter(values.next().getGroupname()));
+ sb.append(HttpMessages.filter(values.next().getGroupname()));
}
sb.append("\"");
}
@@ -292,7 +292,7 @@ public class MemoryUser extends Abstract
sb.append(',');
}
n++;
- sb.append(RequestUtil.filter(values.next().getRolename()));
+ sb.append(HttpMessages.filter(values.next().getRolename()));
}
sb.append("\"");
}
@@ -309,11 +309,11 @@ public class MemoryUser extends Abstract
public String toString() {
StringBuilder sb = new StringBuilder("User username=\"");
- sb.append(RequestUtil.filter(username));
+ sb.append(HttpMessages.filter(username));
sb.append("\"");
if (fullName != null) {
sb.append(", fullName=\"");
- sb.append(RequestUtil.filter(fullName));
+ sb.append(HttpMessages.filter(fullName));
sb.append("\"");
}
synchronized (groups) {
@@ -326,7 +326,7 @@ public class MemoryUser extends Abstract
sb.append(',');
}
n++;
- sb.append(RequestUtil.filter(values.next().getGroupname()));
+ sb.append(HttpMessages.filter(values.next().getGroupname()));
}
sb.append("\"");
}
@@ -341,7 +341,7 @@ public class MemoryUser extends Abstract
sb.append(',');
}
n++;
- sb.append(RequestUtil.filter(values.next().getRolename()));
+ sb.append(HttpMessages.filter(values.next().getRolename()));
}
sb.append("\"");
}
Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Sat Dec 20 20:32:39 2014
@@ -45,44 +45,6 @@ public final class RequestUtil {
/**
- * Filter the specified message string for characters that are sensitive
- * in HTML. This avoids potential attacks caused by including JavaScript
- * codes in the request URL that is often reported in error messages.
- *
- * @param message The message string to be filtered
- */
- public static String filter(String message) {
-
- if (message == null)
- return (null);
-
- char content[] = new char[message.length()];
- message.getChars(0, message.length(), content, 0);
- StringBuilder result = new StringBuilder(content.length + 50);
- for (int i = 0; i < content.length; i++) {
- switch (content[i]) {
- case '<':
- result.append("<");
- break;
- case '>':
- result.append(">");
- break;
- case '&':
- result.append("&");
- break;
- case '"':
- result.append(""");
- break;
- default:
- result.append(content[i]);
- }
- }
- return (result.toString());
-
- }
-
-
- /**
* Append request parameters from the specified String to the specified
* Map. It is presumed that the specified Map is not accessed from any
* other thread, so no synchronization is performed.
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Sat Dec 20 20:32:39 2014
@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -149,12 +149,12 @@ public class ErrorReportValve extends Va
if (statusCode < 400 || response.getContentWritten() > 0 || !response.setErrorReported()) {
return;
}
- String message = RequestUtil.filter(response.getMessage());
+ String message = HttpMessages.filter(response.getMessage());
if (message == null) {
if (throwable != null) {
String exceptionMessage = throwable.getMessage();
if (exceptionMessage != null && exceptionMessage.length() > 0) {
- message = RequestUtil.filter((new Scanner(exceptionMessage)).nextLine());
+ message = HttpMessages.filter((new Scanner(exceptionMessage)).nextLine());
}
}
if (message == null) {
@@ -227,7 +227,7 @@ public class ErrorReportValve extends Va
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.exception"));
sb.append("</b></p><pre>");
- sb.append(RequestUtil.filter(stackTrace));
+ sb.append(HttpMessages.filter(stackTrace));
sb.append("</pre>");
int loops = 0;
@@ -237,7 +237,7 @@ public class ErrorReportValve extends Va
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.rootCause"));
sb.append("</b></p><pre>");
- sb.append(RequestUtil.filter(stackTrace));
+ sb.append(HttpMessages.filter(stackTrace));
sb.append("</pre>");
// In case root cause is somehow heavily nested
rootCause = rootCause.getCause();
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java?rev=1647051&r1=1647050&r2=1647051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java Sat Dec 20 20:32:39 2014
@@ -119,7 +119,7 @@ public class HttpMessages {
public static String filter(String message) {
if (message == null) {
- return (null);
+ return null;
}
char content[] = new char[message.length()];
@@ -143,7 +143,7 @@ public class HttpMessages {
result.append(content[i]);
}
}
- return (result.toString());
+ return result.toString();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1647051 - in /tomcat/trunk/java/org/apache: catalina/connector/
catalina/manager/ catalina/manager/host/ catalina/servlets/ catalina/users/
catalina/util/ catalina/valves/ tomcat/util/http/
Posted by Mark Thomas <ma...@apache.org>.
On 22/12/2014 12:34, Konstantin Kolinko wrote:
> 2014-12-20 23:32 GMT+03:00 <ma...@apache.org>:
>> Author: markt
>> Date: Sat Dec 20 20:32:39 2014
>> New Revision: 1647051
>>
>> URL: http://svn.apache.org/r1647051
>> Log:
>> Remove duplicate utility method.
>
>
> 1). RequestUtil.filter() is used in 404.jsp of manager and
> host-manager applications. Those JSP pages have to be fixed as well.
>
> 2). Actually searching for uses of HttpMessages.filter() method in
> Tomcat 8/7/6, it is only used once, in
> org.apache.catalina.ssi.SSIMediator.encode(String,String).
>
> The HttpMessages class is about HTTP protocol reason phrase.
>
> As such, I think that HTML markup filtering method does not belong
> there, and that is better to fix this duplicate code issue in the
> opposite way by choosing RequestUtil.filter() as the winner.
Based on 2), I agree with you. I opted for the current approach based on
which was more broadly accessible but given that everything that uses
this functionality is in o.a.catalina swapping these over makese sense.
I'll revert this commit and apply the better fix shortly.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1647051 - in /tomcat/trunk/java/org/apache:
catalina/connector/ catalina/manager/ catalina/manager/host/
catalina/servlets/ catalina/users/ catalina/util/ catalina/valves/ tomcat/util/http/
Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-12-20 23:32 GMT+03:00 <ma...@apache.org>:
> Author: markt
> Date: Sat Dec 20 20:32:39 2014
> New Revision: 1647051
>
> URL: http://svn.apache.org/r1647051
> Log:
> Remove duplicate utility method.
1). RequestUtil.filter() is used in 404.jsp of manager and
host-manager applications. Those JSP pages have to be fixed as well.
2). Actually searching for uses of HttpMessages.filter() method in
Tomcat 8/7/6, it is only used once, in
org.apache.catalina.ssi.SSIMediator.encode(String,String).
The HttpMessages class is about HTTP protocol reason phrase.
As such, I think that HTML markup filtering method does not belong
there, and that is better to fix this duplicate code issue in the
opposite way by choosing RequestUtil.filter() as the winner.
> Modified:
> tomcat/trunk/java/org/apache/catalina/connector/Response.java
> tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
> tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
> tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
> tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
> tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1647051&r1=1647050&r2=1647051&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Dec 20 20:32:39 2014
> @@ -45,12 +45,12 @@ import org.apache.catalina.Globals;
> import org.apache.catalina.Session;
> import org.apache.catalina.Wrapper;
> import org.apache.catalina.security.SecurityUtil;
> -import org.apache.catalina.util.RequestUtil;
> import org.apache.catalina.util.SessionConfig;
> import org.apache.coyote.ActionCode;
> import org.apache.tomcat.util.buf.CharChunk;
> import org.apache.tomcat.util.buf.UEncoder;
> import org.apache.tomcat.util.http.FastHttpDateFormat;
> +import org.apache.tomcat.util.http.HttpMessages;
> import org.apache.tomcat.util.http.MimeHeaders;
> import org.apache.tomcat.util.http.parser.MediaTypeCache;
> import org.apache.tomcat.util.net.URL;
> @@ -1297,7 +1297,7 @@ public class Response
> if (getContext().getSendRedirectBody()) {
> PrintWriter writer = getWriter();
> writer.print(sm.getString("coyoteResponse.sendRedirect.note",
> - RequestUtil.filter(absolute)));
> + HttpMessages.filter(absolute)));
> flushBuffer();
> }
> } catch (IllegalArgumentException e) {
>
(...)
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org