root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed wrong encoding of URI templates with @-signs (SPR-6874)

This commit is contained in:
Arjen Poutsma 2010-03-02 11:30:36 +00:00
parent e653a9cd03
commit d207c2294d
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
View File

@ -182,7 +182,7 @@ public class UriTemplate {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);
} }
catch (URISyntaxException ex) { catch (URISyntaxException ex) {
throw new IllegalArgumentException("Could not create URI from [" + uri + "]: " + ex); throw new IllegalArgumentException("Could not create URI from [" + uri + "]: " + ex, ex);
} }
} }
@ -201,24 +201,23 @@ public class UriTemplate {
Matcher m = NAMES_PATTERN.matcher(uriTemplate); Matcher m = NAMES_PATTERN.matcher(uriTemplate);
int end = 0; int end = 0;
while (m.find()) { while (m.find()) {
this.patternBuilder.append(encodeAndQuote(uriTemplate, end, m.start())); this.patternBuilder.append(quote(uriTemplate, end, m.start()));
this.patternBuilder.append(VALUE_REGEX); this.patternBuilder.append(VALUE_REGEX);
this.variableNames.add(m.group(1)); this.variableNames.add(m.group(1));
end = m.end(); end = m.end();
} }
this.patternBuilder.append(encodeAndQuote(uriTemplate, end, uriTemplate.length())); this.patternBuilder.append(quote(uriTemplate, end, uriTemplate.length()));
int lastIdx = this.patternBuilder.length() - 1; int lastIdx = this.patternBuilder.length() - 1;
if (lastIdx >= 0 && this.patternBuilder.charAt(lastIdx) == '/') { if (lastIdx >= 0 && this.patternBuilder.charAt(lastIdx) == '/') {
this.patternBuilder.deleteCharAt(lastIdx); this.patternBuilder.deleteCharAt(lastIdx);
} }
} }
private String encodeAndQuote(String fullPath, int start, int end) { private String quote(String fullPath, int start, int end) {
if (start == end) { if (start == end) {
return ""; return "";
} }
String result = encodeUri(fullPath.substring(start, end)).toASCIIString(); return Pattern.quote(fullPath.substring(start, end));
return Pattern.quote(result);
} }
private List<String> getVariableNames() { private List<String> getVariableNames() {

2
org.springframework.web/src/main/java/org/springframework/web/util/UriUtils.java
View File

@ -61,7 +61,7 @@ public abstract class UriUtils {
private static final String SCHEME_PATTERN = "([^:/?#]+):"; private static final String SCHEME_PATTERN = "([^:/?#]+):";
private static final String USERINFO_PATTERN = "([^@]*)"; private static final String USERINFO_PATTERN = "([^@/]*)";
private static final String HOST_PATTERN = "([^/?#:]*)"; private static final String HOST_PATTERN = "([^/?#:]*)";

3
org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
View File

@ -127,6 +127,9 @@ public class RestTemplateIntegrationTests {
public void uri() throws InterruptedException, URISyntaxException { public void uri() throws InterruptedException, URISyntaxException {
String result = template.getForObject(URI + "/uri/{query}", String.class, "Z\u00fcrich"); String result = template.getForObject(URI + "/uri/{query}", String.class, "Z\u00fcrich");
assertEquals("Invalid request URI", "/uri/Z%FCrich", result); assertEquals("Invalid request URI", "/uri/Z%FCrich", result);
result = template.getForObject(URI + "/uri/query={query}", String.class, "foo@bar");
assertEquals("Invalid request URI", "/uri/query=foo@bar", result);
} }
/** Servlet that returns and error message for a given status code. */ /** Servlet that returns and error message for a given status code. */

7
org.springframework.web/src/test/java/org/springframework/web/util/UriTemplateTests.java
View File

@ -152,4 +152,11 @@ public class UriTemplateTests {
assertEquals("/$replacement", uri.toString()); assertEquals("/$replacement", uri.toString());
} }
@Test
public void expandWithAtSign() {
UriTemplate template = new UriTemplate("http://localhost/query={query}");
URI uri = template.expand("foo@bar");
assertEquals("http://localhost/query=foo@bar", uri.toString());
}
} }

1
org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTest.java
View File

@ -117,6 +117,7 @@ public class UriUtilsTest {
assertEquals("Invalid encoded URI", "../../../demo/jfc/SwingSet2/src/SwingSet2.java", assertEquals("Invalid encoded URI", "../../../demo/jfc/SwingSet2/src/SwingSet2.java",
UriUtils.encodeUri("../../../demo/jfc/SwingSet2/src/SwingSet2.java", ENC)); UriUtils.encodeUri("../../../demo/jfc/SwingSet2/src/SwingSet2.java", ENC));
assertEquals("Invalid encoded URI", "file:///~/calendar", UriUtils.encodeUri("file:///~/calendar", ENC)); assertEquals("Invalid encoded URI", "file:///~/calendar", UriUtils.encodeUri("file:///~/calendar", ENC));
assertEquals("Invalid encoded URI", "http://example.com/query=foo@bar", UriUtils.encodeUri("http://example.com/query=foo@bar", ENC));
} }