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 2017/06/29 20:03:00 UTC
svn commit: r1800309 - in /tomcat/trunk:
java/org/apache/catalina/servlets/WebdavServlet.java
java/org/apache/catalina/util/URLEncoder.java
test/org/apache/catalina/util/TestURLEncoder.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 29 20:02:59 2017
New Revision: 1800309
URL: http://svn.apache.org/viewvc?rev=1800309&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61229
Correct a regression in 9.0.0.M21 that broke WebDAV handling for resources with names that included a '&' character.
Added:
tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1800309&r1=1800308&r2=1800309&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu Jun 29 20:02:59 2017
@@ -44,6 +44,7 @@ import org.apache.catalina.WebResource;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.util.ConcurrentDateFormat;
import org.apache.catalina.util.DOMWriter;
+import org.apache.catalina.util.URLEncoder;
import org.apache.catalina.util.XMLWriter;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -119,14 +120,22 @@ import org.xml.sax.SAXException;
*
* @author Remy Maucherat
*/
-public class WebdavServlet
- extends DefaultServlet {
+public class WebdavServlet extends DefaultServlet {
private static final long serialVersionUID = 1L;
// -------------------------------------------------------------- Constants
+ private static final URLEncoder URL_ENCODER_XML;
+ static {
+ URL_ENCODER_XML = (URLEncoder) URLEncoder.DEFAULT.clone();
+ // Remove '&' from the safe character set since while it it permitted
+ // in a URI path, it is not permitted in XML and encoding it is a simple
+ // way to address this.
+ URL_ENCODER_XML.removeSafeCharacter('&');
+ }
+
private static final String METHOD_PROPFIND = "PROPFIND";
private static final String METHOD_PROPPATCH = "PROPPATCH";
private static final String METHOD_MKCOL = "MKCOL";
@@ -379,6 +388,18 @@ public class WebdavServlet
}
+ /**
+ * URL rewriter.
+ *
+ * @param path Path which has to be rewritten
+ * @return the rewritten path
+ */
+ @Override
+ protected String rewriteUrl(String path) {
+ return URL_ENCODER_XML.encode(path, StandardCharsets.UTF_8);
+ }
+
+
/**
* Override the DefaultServlet implementation and only use the PathInfo. If
* the ServletPath is non-null, it will be because the WebDAV servlet has
Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=1800309&r1=1800308&r2=1800309&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Thu Jun 29 20:02:59 2017
@@ -34,10 +34,10 @@ import java.util.BitSet;
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
-public class URLEncoder {
+public class URLEncoder implements Cloneable {
+
private static final char[] hexadecimal =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'A', 'B', 'C', 'D', 'E', 'F'};
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
public static final URLEncoder DEFAULT = new URLEncoder();
public static final URLEncoder QUERY = new URLEncoder();
@@ -99,12 +99,14 @@ public class URLEncoder {
}
//Array containing the safe characters set.
- private final BitSet safeCharacters = new BitSet(256);
+ private final BitSet safeCharacters;
private boolean encodeSpaceAsPlus = false;
public URLEncoder() {
+ this(new BitSet(256));
+
for (char i = 'a'; i <= 'z'; i++) {
addSafeCharacter(i);
}
@@ -117,8 +119,18 @@ public class URLEncoder {
}
- public void addSafeCharacter( char c ) {
- safeCharacters.set( c );
+ private URLEncoder(BitSet safeCharacters) {
+ this.safeCharacters = safeCharacters;
+ }
+
+
+ public void addSafeCharacter(char c) {
+ safeCharacters.set(c);
+ }
+
+
+ public void removeSafeCharacter(char c) {
+ safeCharacters.clear(c);
}
@@ -172,4 +184,12 @@ public class URLEncoder {
}
return rewrittenPath.toString();
}
+
+
+ @Override
+ public Object clone() {
+ URLEncoder result = new URLEncoder((BitSet) safeCharacters.clone());
+ result.setEncodeSpaceAsPlus(encodeSpaceAsPlus);
+ return result;
+ }
}
Added: tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java?rev=1800309&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java (added)
+++ tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java Thu Jun 29 20:02:59 2017
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.util;
+
+import java.nio.charset.StandardCharsets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestURLEncoder {
+
+ private static final String SPACE = " ";
+ private static final String DOLLAR = "$";
+ private static final String AMPERSAND = "&";
+ private static final String AMPERSAND_ENCODED = "%26";
+
+ @Test
+ public void testClone() {
+ URLEncoder original = new URLEncoder();
+ URLEncoder clone = (URLEncoder) original.clone();
+
+ // Ensure encode as space is not shared
+ original.setEncodeSpaceAsPlus(true);
+ Assert.assertNotEquals(original.encode(SPACE, StandardCharsets.UTF_8),
+ clone.encode(SPACE, StandardCharsets.UTF_8));
+
+ // Ensure safe characters is not shared
+ original.addSafeCharacter('$');
+ Assert.assertNotEquals(original.encode(DOLLAR, StandardCharsets.UTF_8),
+ clone.encode(DOLLAR, StandardCharsets.UTF_8));
+ }
+
+
+ @Test
+ public void testRemoveSafeCharacter() {
+ URLEncoder xml = (URLEncoder) URLEncoder.DEFAULT.clone();
+ // This should not encode '&'
+ Assert.assertEquals(AMPERSAND, xml.encode(AMPERSAND, StandardCharsets.UTF_8));
+ xml.removeSafeCharacter('&');
+ Assert.assertEquals(AMPERSAND_ENCODED, xml.encode(AMPERSAND, StandardCharsets.UTF_8));
+ }
+}
Propchange: tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1800309&r1=1800308&r2=1800309&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 29 20:02:59 2017
@@ -69,6 +69,11 @@
thread that cleans the log files is marked as daemon thread.
(violetagg)
</fix>
+ <fix>
+ <bug>61229</bug>: Correct a regression in 9.0.0.M21 that broke WebDAV
+ handling for resources with names that included a <code>&</code>
+ character. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800309 - in /tomcat/trunk:
java/org/apache/catalina/servlets/WebdavServlet.java
java/org/apache/catalina/util/URLEncoder.java
test/org/apache/catalina/util/TestURLEncoder.java webapps/docs/changelog.xml
Posted by Mark Thomas <ma...@apache.org>.
On 30/06/17 22:18, Christopher Schultz wrote:
> On 6/30/17 5:11 PM, Mark Thomas wrote:
<snip/>
>> Arguably, & is the more correct but either approach is legal as
>> far as the specifications are concerned.
>
> I'm surprised to hear that they are equivalent.
>
> If I were writing a WebDAV client (and it's probably good that I
> wouldn't take this naïve approach, I guess), I would expect that the
> URLs coming back should be XML-decoded (of course, the XML library
> ought to do this for me).
>
> Let's say I have a file on the disk named "H&M.txt".
> In the XML, I'll get back "H%26M.txt" as the filename.
> When I convert that to a URL, I'll urlencode it and get "H%2526M.txt".
> If I try to request that file, I'll fail, because I need to request
> "H%26M.txt" or "H&M.txt" but instead I've double-encoded the filename.
>
> Is this something unique to the WebDAV spec (which I haven't read,
> obviously)?
What you are getting back is a URL so the expectation is that it is
already correctly %nn encoded. See section 8.3.1 of RFC 4918.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800309 - in /tomcat/trunk:
java/org/apache/catalina/servlets/WebdavServlet.java
java/org/apache/catalina/util/URLEncoder.java
test/org/apache/catalina/util/TestURLEncoder.java webapps/docs/changelog.xml
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Mark,
On 6/30/17 5:11 PM, Mark Thomas wrote:
> On 30/06/17 22:06, Christopher Schultz wrote:
>> Mark,
>>
>> (This time, to the list and not just you)
>>
>> This seems like the wrong approach.
>>
>> I think you want to leave the URLEncoding alone and instead
>> XML-escape anything you intend to put into an XML document
>> separately.
>>
>> You want the XML to end up looking like this:
>>
>> <element>url.which.contains.a.&.symbol</element>
>>
>> and not this:
>>
>> <element>url.which.contains.a.%26.symbol</element>
>>
>> Or am I misunderstanding what's going on, here?
>
> Arguably, & is the more correct but either approach is legal as
> far as the specifications are concerned.
I'm surprised to hear that they are equivalent.
If I were writing a WebDAV client (and it's probably good that I
wouldn't take this naïve approach, I guess), I would expect that the
URLs coming back should be XML-decoded (of course, the XML library
ought to do this for me).
Let's say I have a file on the disk named "H&M.txt".
In the XML, I'll get back "H%26M.txt" as the filename.
When I convert that to a URL, I'll urlencode it and get "H%2526M.txt".
If I try to request that file, I'll fail, because I need to request
"H%26M.txt" or "H&M.txt" but instead I've double-encoded the filename.
Is this something unique to the WebDAV spec (which I haven't read,
obviously)?
> Since we need to URL encode anyway, fixing this via tweaking the
> URL encoding looked to be simpler. It was also consistent with how
> it was working before the regression was introduced.
Interesting.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBCAAGBQJZVsAsAAoJEBzwKT+lPKRYZwgP/iAtunbqVhq5g8l7Bhr/wXWs
mKFrg0PvjynUpCbiUMt8dRgm5lQhMjX2cPofqL45gVvGU6jfZKPFWaRIxdp2r65S
o7v1okYlbLNfg9sCxBLcm5Ck1sw4+ROTsho/Pgj8BYnTe0uaOynOoQCvNKI2Jeyo
If7OKpDFC29RqUFsLElRN3x5TWHN0nkFUnaBKgaDcWwak5ncPwLW7RGfBu7DgPDn
s1V5DfxUCh0fFQuDsdEOSPXZYHgWyMKo7NYGxWUb8hebzOHIjcTZqA/LMmBC3e3A
n/2x/fkh5ujipj4oEZYQxk4vuuGkJaCqfxDbicBXgXWMccxVPFQK8EW6Uk7oIUSz
/JyW3kwWZVclP4VENZTkZtv+udw45ENsLuJxY8SaiEeqsi6yYVUVT0mtZgoZb6YK
7DePYd4xxSRnhV9GsejPmerXdqowYa2hV3CPIPAh+gfangXUJOlg3RcmbW30UWxQ
7dclxPb+z7x9q/XYl50dXcNvSltyeGcOa/erR4r4dJxY/IEs8sty8w/Ud0PhBMJl
YIHRCKgresuTol23oRA4vbCAHW8cbJFgJ7LQuTy98N4d0VXyFqxg/nPSBNjrk/LA
ro10STvsVQnx103mAndSiTPZEaalGRqzgr1dsB6HvpBdCPFd1nPDZh/6WDz3m8xO
alpe/9EuxU18mZ0x9ZOD
=YVkK
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800309 - in /tomcat/trunk:
java/org/apache/catalina/servlets/WebdavServlet.java
java/org/apache/catalina/util/URLEncoder.java
test/org/apache/catalina/util/TestURLEncoder.java webapps/docs/changelog.xml
Posted by Mark Thomas <ma...@apache.org>.
On 30/06/17 22:06, Christopher Schultz wrote:
> Mark,
>
> (This time, to the list and not just you)
>
> This seems like the wrong approach.
>
> I think you want to leave the URLEncoding alone and instead XML-escape
> anything you intend to put into an XML document separately.
>
> You want the XML to end up looking like this:
>
> <element>url.which.contains.a.&.symbol</element>
>
> and not this:
>
> <element>url.which.contains.a.%26.symbol</element>
>
> Or am I misunderstanding what's going on, here?
Arguably, & is the more correct but either approach is legal as far
as the specifications are concerned.
Since we need to URL encode anyway, fixing this via tweaking the URL
encoding looked to be simpler. It was also consistent with how it was
working before the regression was introduced.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800309 - in /tomcat/trunk:
java/org/apache/catalina/servlets/WebdavServlet.java
java/org/apache/catalina/util/URLEncoder.java
test/org/apache/catalina/util/TestURLEncoder.java webapps/docs/changelog.xml
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Mark,
(This time, to the list and not just you)
This seems like the wrong approach.
I think you want to leave the URLEncoding alone and instead XML-escape
anything you intend to put into an XML document separately.
You want the XML to end up looking like this:
<element>url.which.contains.a.&.symbol</element>
and not this:
<element>url.which.contains.a.%26.symbol</element>
Or am I misunderstanding what's going on, here?
- -chris
On 6/29/17 4:03 PM, markt@apache.org wrote:
> Author: markt Date: Thu Jun 29 20:02:59 2017 New Revision: 1800309
>
> URL: http://svn.apache.org/viewvc?rev=1800309&view=rev Log: Fix
> https://bz.apache.org/bugzilla/show_bug.cgi?id=61229 Correct a
> regression in 9.0.0.M21 that broke WebDAV handling for resources
> with names that included a '&' character.
>
> Added:
> tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java
> (with props) Modified:
> tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
> tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ser
vlets/WebdavServlet.java?rev=1800309&r1=1800308&r2=1800309&view=diff
>
>
========================================================================
======
> ---
> tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
> (original) +++
> tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
> Thu Jun 29 20:02:59 2017 @@ -44,6 +44,7 @@ import
> org.apache.catalina.WebResource; import
> org.apache.catalina.connector.RequestFacade; import
> org.apache.catalina.util.ConcurrentDateFormat; import
> org.apache.catalina.util.DOMWriter; +import
> org.apache.catalina.util.URLEncoder; import
> org.apache.catalina.util.XMLWriter; import
> org.apache.tomcat.util.buf.UDecoder; import
> org.apache.tomcat.util.http.FastHttpDateFormat; @@ -119,14 +120,22
> @@ import org.xml.sax.SAXException; * * @author Remy Maucherat */
> -public class WebdavServlet - extends DefaultServlet { +public
> class WebdavServlet extends DefaultServlet {
>
> private static final long serialVersionUID = 1L;
>
>
> // --------------------------------------------------------------
> Constants
>
> + private static final URLEncoder URL_ENCODER_XML; + static
> { + URL_ENCODER_XML = (URLEncoder)
> URLEncoder.DEFAULT.clone(); + // Remove '&' from the safe
> character set since while it it permitted + // in a URI
> path, it is not permitted in XML and encoding it is a simple +
> // way to address this. +
> URL_ENCODER_XML.removeSafeCharacter('&'); + } + private static
> final String METHOD_PROPFIND = "PROPFIND"; private static final
> String METHOD_PROPPATCH = "PROPPATCH"; private static final String
> METHOD_MKCOL = "MKCOL"; @@ -379,6 +388,18 @@ public class
> WebdavServlet }
>
>
> + /** + * URL rewriter. + * + * @param path Path
> which has to be rewritten + * @return the rewritten path +
> */ + @Override + protected String rewriteUrl(String path) { +
> return URL_ENCODER_XML.encode(path, StandardCharsets.UTF_8); +
> } + + /** * Override the DefaultServlet implementation and only use
> the PathInfo. If * the ServletPath is non-null, it will be because
> the WebDAV servlet has
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/uti
l/URLEncoder.java?rev=1800309&r1=1800308&r2=1800309&view=diff
>
>
========================================================================
======
> --- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
> (original) +++
> tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Thu Jun
> 29 20:02:59 2017 @@ -34,10 +34,10 @@ import java.util.BitSet; *
> @author Craig R. McClanahan * @author Remy Maucherat */ -public
> class URLEncoder { +public class URLEncoder implements Cloneable {
> + private static final char[] hexadecimal = - {'0', '1', '2',
> '3', '4', '5', '6', '7', '8', '9', - 'A', 'B', 'C', 'D', 'E',
> 'F'}; + {'0', '1', '2', '3', '4', '5', '6', '7', '8',
> '9', 'A', 'B', 'C', 'D', 'E', 'F'};
>
> public static final URLEncoder DEFAULT = new URLEncoder(); public
> static final URLEncoder QUERY = new URLEncoder(); @@ -99,12 +99,14
> @@ public class URLEncoder { }
>
> //Array containing the safe characters set. - private final
> BitSet safeCharacters = new BitSet(256); + private final BitSet
> safeCharacters;
>
> private boolean encodeSpaceAsPlus = false;
>
>
> public URLEncoder() { + this(new BitSet(256)); + for (char i
> = 'a'; i <= 'z'; i++) { addSafeCharacter(i); } @@ -117,8 +119,18 @@
> public class URLEncoder { }
>
>
> - public void addSafeCharacter( char c ) { -
> safeCharacters.set( c ); + private URLEncoder(BitSet
> safeCharacters) { + this.safeCharacters = safeCharacters; +
> } + + + public void addSafeCharacter(char c) { +
> safeCharacters.set(c); + } + + + public void
> removeSafeCharacter(char c) { + safeCharacters.clear(c); }
>
>
> @@ -172,4 +184,12 @@ public class URLEncoder { } return
> rewrittenPath.toString(); } + + + @Override + public Object
> clone() { + URLEncoder result = new URLEncoder((BitSet)
> safeCharacters.clone()); +
> result.setEncodeSpaceAsPlus(encodeSpaceAsPlus); + return
> result; + } }
>
> Added:
> tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/uti
l/TestURLEncoder.java?rev=1800309&view=auto
>
>
========================================================================
======
> --- tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java
> (added) +++
> tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java Thu
> Jun 29 20:02:59 2017 @@ -0,0 +1,56 @@ +/* + * Licensed to the
> Apache Software Foundation (ASF) under one or more + * contributor
> license agreements. See the NOTICE file distributed with + * this
> work for additional information regarding copyright ownership. + *
> The ASF licenses this file to You under the Apache License, Version
> 2.0 + * (the "License"); you may not use this file except in
> compliance with + * the License. You may obtain a copy of the
> License at + * + * http://www.apache.org/licenses/LICENSE-2.0
> + * + * Unless required by applicable law or agreed to in writing,
> software + * distributed under the License is distributed on an "AS
> IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
> express or implied. + * See the License for the specific language
> governing permissions and + * limitations under the License. + */
> +package org.apache.catalina.util; + +import
> java.nio.charset.StandardCharsets; + +import org.junit.Assert;
> +import org.junit.Test; + +public class TestURLEncoder { + +
> private static final String SPACE = " "; + private static final
> String DOLLAR = "$"; + private static final String AMPERSAND =
> "&"; + private static final String AMPERSAND_ENCODED = "%26"; +
> + @Test + public void testClone() { + URLEncoder
> original = new URLEncoder(); + URLEncoder clone =
> (URLEncoder) original.clone(); + + // Ensure encode as space
> is not shared + original.setEncodeSpaceAsPlus(true); +
> Assert.assertNotEquals(original.encode(SPACE,
> StandardCharsets.UTF_8), + clone.encode(SPACE,
> StandardCharsets.UTF_8)); + + // Ensure safe characters is
> not shared + original.addSafeCharacter('$'); +
> Assert.assertNotEquals(original.encode(DOLLAR,
> StandardCharsets.UTF_8), + clone.encode(DOLLAR,
> StandardCharsets.UTF_8)); + } + + + @Test + public void
> testRemoveSafeCharacter() { + URLEncoder xml = (URLEncoder)
> URLEncoder.DEFAULT.clone(); + // This should not encode '&'
> + Assert.assertEquals(AMPERSAND, xml.encode(AMPERSAND,
> StandardCharsets.UTF_8)); + xml.removeSafeCharacter('&'); +
> Assert.assertEquals(AMPERSAND_ENCODED, xml.encode(AMPERSAND,
> StandardCharsets.UTF_8)); + } +}
>
> Propchange:
> tomcat/trunk/test/org/apache/catalina/util/TestURLEncoder.java
> ----------------------------------------------------------------------
- --------
>
>
svn:eol-style = native
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?r
ev=1800309&r1=1800308&r2=1800309&view=diff
>
>
========================================================================
======
> --- tomcat/trunk/webapps/docs/changelog.xml (original) +++
> tomcat/trunk/webapps/docs/changelog.xml Thu Jun 29 20:02:59 2017 @@
> -69,6 +69,11 @@ thread that cleans the log files is marked as
> daemon thread. (violetagg) </fix> + <fix> +
> <bug>61229</bug>: Correct a regression in 9.0.0.M21 that broke
> WebDAV + handling for resources with names that included a
> <code>&</code> + character. (markt) + </fix>
> </changelog> </subsection> <subsection name="Coyote">
>
>
>
> ---------------------------------------------------------------------
>
>
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBCAAGBQJZVr1MAAoJEBzwKT+lPKRYpwYP/2Qhpnh/iwZGhAOCBOc/P0Nd
R+6lB7gG6BNWQlWfC3NFydobW4AMUP5JOEl/cgsnjlXOzbZ/gDBZAnf43OzAzX1z
mtp0CnvtlryKp6p/jGu1eB/vYxM+bVmqvJw6OIuQ5aeebO0G6SmMnnd+s9M5TUz8
iiAX7/6XTLGZCivY5KTPhTX8n+BLgFrD+zkGsPYeXeNbwmEoAhnhmprYLigzAuEU
bszxLGkZXyOy/3i64dfTaPPGLn7gze7caz33bzCg1qJR23PxMHCsJkRqw6sJVjzW
VrTtSVaEWm5CweK5qvPAbFJjfPgV+O2ZY8+qc8PlEbxt6q+bxFNdiaCnK8y/i9pA
6N9bQUvv0FyiJ7KZVDzfzzIv8r4PhXU3MXx2doOf0GTRP33AD9YdK3XI+f8cGxw2
elZZCv9/zOOr/yGgBucKt39vrKIVxPyOdQyPHqGruSkBMdhg54Uj5sgZyzTET48O
FFKxR+Et3GPyBrUM4pBELTCDtSnBBXvCbHmbahsGFYqWY1IaW+XtzHTbhsVm8GeW
JV+VK9aYVcLNx/BzMT6WzhBfDVQZGysDbwJQlpzKhDvlHQuPxtQwF3vuHBTW6GHV
0uJkOwh0SgGKD8C19vHQqQxv69udVkuCd9eT4NzyDkUCcI9zf9GxQr8WXdZ7/130
cpjTynl+w5mxnh5BOusn
=ZY7P
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org