Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UriUtils.extractFileExtension properly handles all fragments

Browse Source 
Issue: SPR-15786
This commit is contained in:
Juergen Hoeller
2017-07-19 22:40:24 +02:00
parent ac1d3b22c9
commit 13080f04f4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/web/util/UriUtils.java
View File

@@ -336,11 +336,12 @@ public abstract class UriUtils {
@Nullable @Nullable
public static String extractFileExtension(String path) { public static String extractFileExtension(String path) {
int end = path.indexOf('?'); int end = path.indexOf('?');
int fragmentIndex = path.indexOf('#');
if (fragmentIndex != -1 && (end == -1 || fragmentIndex < end)) {
end = fragmentIndex;
}
if (end == -1) { if (end == -1) {
end = path.indexOf('#'); end = path.length();
if (end == -1) {
end = path.length();
}
} }
int begin = path.lastIndexOf('/', end) + 1; int begin = path.lastIndexOf('/', end) + 1;
int paramIndex = path.indexOf(';', begin); int paramIndex = path.indexOf(';', begin);

3
spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
View File

@@ -27,6 +27,7 @@ import static org.junit.Assert.*;
/** /**
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Med Belamachi
*/ */
public class UriUtilsTests { public class UriUtilsTests {
@@ -115,6 +116,8 @@ public class UriUtilsTests {
assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/a")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/a"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a.do")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a.do"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html#aaa?bbb"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html#aaa.xml?bbb"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=a")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=a"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a"));
assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a.do")); assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a.do"));