Author: markt
Date: Tue Jul 26 15:38:33 2016
New Revision: 1754144
URL: http://svn.apache.org/viewvc?rev=1754144&view=rev
Log:
Add an encoding parameter to URLEncoder.encode() and be explicit about the
encoding wherever Tomcat uses this method.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 26 15:38:33 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753358,1753363,1754111
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753358,1753363,1754111,1754140-1754141
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Jul 26 15:38:33 2016
@@ -764,7 +764,7 @@ public class CoyoteAdapter implements Ad
// Possible redirect
MessageBytes redirectPathMB = request.getMappingData().redirectPath;
if (!redirectPathMB.isNull()) {
- String redirectPath =
URLEncoder.DEFAULT.encode(redirectPathMB.toString());
+ String redirectPath =
URLEncoder.DEFAULT.encode(redirectPathMB.toString(), "UTF-8");
String query = request.getQueryString();
if (request.isRequestedSessionIdFromURL()) {
// This is not optimal, but as this is not very common, it
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Tue Jul 26 15:38:33 2016
@@ -464,7 +464,7 @@ public class ApplicationContext implemen
mappingData.recycle();
- String encodedUri = URLEncoder.DEFAULT.encode(uriCC.toString());
+ String encodedUri = URLEncoder.DEFAULT.encode(uriCC.toString(),
"UTF-8");
// Construct a RequestDispatcher to process this request
return new ApplicationDispatcher(wrapper, encodedUri, wrapperPath,
pathInfo,
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Jul 26 15:38:33 2016
@@ -2031,7 +2031,7 @@ public class StandardContext extends Con
log.warn(sm.getString(
"standardContext.pathInvalid", path, this.path));
}
- encodedPath = URLEncoder.DEFAULT.encode(this.path);
+ encodedPath = URLEncoder.DEFAULT.encode(this.path, "UTF-8");
if (getName() == null) {
setName(this.path);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Tue Jul 26 15:38:33 2016
@@ -430,10 +430,10 @@ public final class HTMLManagerServlet ex
StringBuilder tmp = new StringBuilder();
tmp.append("path=");
- tmp.append(URL_ENCODER.encode(displayPath));
+ tmp.append(URL_ENCODER.encode(displayPath, "UTF-8"));
if (ctxt.getWebappVersion().length() > 0) {
tmp.append("&version=");
- tmp.append(URL_ENCODER.encode(ctxt.getWebappVersion()));
+ tmp.append(URL_ENCODER.encode(ctxt.getWebappVersion(),
"UTF-8"));
}
String pathVersion = tmp.toString();
@@ -445,7 +445,7 @@ public final class HTMLManagerServlet ex
}
args = new Object[7];
- args[0] = "<a href=\"" + URL_ENCODER.encode(contextPath + "/")
+ args[0] = "<a href=\"" + URL_ENCODER.encode(contextPath + "/",
"UTF-8")
+ "\">" + RequestUtil.filter(displayPath) + "</a>";
if ("".equals(ctxt.getWebappVersion())) {
args[1] = noVersion;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Jul 26 15:38:33 2016
@@ -699,7 +699,7 @@ public class DefaultServlet extends Http
* @return the rewritten path
*/
protected String rewriteUrl(String path) {
- return URLEncoder.DEFAULT.encode( path );
+ return URLEncoder.DEFAULT.encode(path, "UTF-8");
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java Tue Jul
26 15:38:33 2016
@@ -296,7 +296,7 @@ public class SSIMediator {
protected String encode(String value, String encoding) {
String retVal = null;
if (encoding.equalsIgnoreCase("url")) {
- retVal = urlEncoder.encode(value);
+ retVal = urlEncoder.encode(value, "UTF-8");
} else if (encoding.equalsIgnoreCase("none")) {
retVal = value;
} else if (encoding.equalsIgnoreCase("entity")) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java Tue Jul
26 15:38:33 2016
@@ -67,13 +67,37 @@ public class URLEncoder {
safeCharacters.set( c );
}
- public String encode( String path ) {
+
+ /**
+ * URL encodes the provided path using UTF-8.
+ *
+ * @param path The path to encode
+ *
+ * @return The encoded path
+ *
+ * @deprecated Use {@link #encode(String, String)}
+ */
+ @Deprecated
+ public String encode(String path) {
+ return encode(path, "UTF-8");
+ }
+
+
+ /**
+ * URL encodes the provided path using the given encoding.
+ *
+ * @param path The path to encode
+ * @param encoding The encoding to use to convert the path to bytes
+ *
+ * @return The encoded path
+ */
+ public String encode(String path, String encoding) {
int maxBytesPerChar = 10;
StringBuilder rewrittenPath = new StringBuilder(path.length());
ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
OutputStreamWriter writer = null;
try {
- writer = new OutputStreamWriter(buf, "UTF8");
+ writer = new OutputStreamWriter(buf, encoding);
} catch (Exception e) {
e.printStackTrace();
writer = new OutputStreamWriter(buf);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1754144&r1=1754143&r2=1754144&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Tue Jul 26 15:38:33 2016
@@ -433,7 +433,7 @@ public class RewriteValve extends ValveB
if (context) {
chunk.append(contextPath);
}
- chunk.append(URLEncoder.DEFAULT.encode(urlString));
+ chunk.append(URLEncoder.DEFAULT.encode(urlString,
"UTF-8"));
request.getCoyoteRequest().requestURI().toChars();
// Decoded and normalized URI
request.getCoyoteRequest().decodedURI().setString(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
