Merge branch '5.1.x'

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -288,6 +288,9 @@ public class PathResourceResolver extends AbstractResourceResolver {
 					return true;
 				}
 			}
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
+			}
 			catch (UnsupportedEncodingException ex) {
 				// Should never happen...
 			}

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -605,7 +605,10 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
 					return true;
 				}
 			}
-			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
+			}
+			catch (UnsupportedEncodingException ex) {
 				// Should never happen...
 			}
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java

@@ -91,6 +91,13 @@ public class PathResourceResolverTests {
 		assertThat(actual).isNull();
 	}
 
+	@Test // gh-23463
+	public void ignoreInvalidEscapeSequence() throws IOException {
+		UrlResource location = new UrlResource(getClass().getResource("./test/"));
+		Resource resource = location.createRelative("test%file.txt");
+		assertTrue(this.resolver.checkResource(resource, location));
+	}
+
 	@Test
 	public void checkResourceWithAllowedLocations() {
 		this.resolver.setAllowedLocations(
@@ -104,8 +111,7 @@ public class PathResourceResolverTests {
 		assertThat(actual).isEqualTo("../testalternatepath/bar.css");
 	}
 
-	// SPR-12432
-	@Test
+	@Test // SPR-12432
 	public void checkServletContextResource() throws Exception {
 		Resource classpathLocation = new ClassPathResource("test/", PathResourceResolver.class);
 		MockServletContext context = new MockServletContext();
@@ -117,8 +123,7 @@ public class PathResourceResolverTests {
 		assertThat(this.resolver.checkResource(resource, servletContextLocation)).isTrue();
 	}
 
-	// SPR-12624
-	@Test
+	@Test // SPR-12624
 	public void checkRelativeLocation() throws Exception {
 		String locationUrl= new UrlResource(getClass().getResource("./test/")).getURL().toExternalForm();
 		Resource location = new UrlResource(locationUrl.replace("/springframework","/../org/springframework"));
@@ -126,15 +131,13 @@ public class PathResourceResolverTests {
 		assertThat(this.resolver.resolveResource(null, "main.css", Collections.singletonList(location), null)).isNotNull();
 	}
 
-	// SPR-12747
-	@Test
+	@Test // SPR-12747
 	public void checkFileLocation() throws Exception {
 		Resource resource = getResource("main.css");
 		assertThat(this.resolver.checkResource(resource, resource)).isTrue();
 	}
 
-	// SPR-13241
-	@Test
+	@Test // SPR-13241
 	public void resolvePathRootResource() {
 		Resource webjarsLocation = new ClassPathResource("/META-INF/resources/webjars/", PathResourceResolver.class);
 		String path = this.resolver.resolveUrlPathInternal("", Collections.singletonList(webjarsLocation), null);