Fix IllegalArgumentException if scheme contains but not starts with U…

…RI variable See spring-projectsGH-33699, Continue of c261ca3
quaff · Oct 16, 2024 · 57d29b0 · 57d29b0
1 parent c261ca3
commit 57d29b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java b/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java
@@ -29,6 +29,7 @@
  * Parser for URI's based on RFC 3986 syntax.
  *
  * @author Rossen Stoyanchev
+ * @author Yanming Zhou
  * @since 6.2
  *
  * @see <a href="https://www.rfc-editor.org/info/rfc3986">RFC 3986</a>
@@ -510,7 +511,7 @@ public InternalParser resolveIfOpaque() {
 
 		public InternalParser captureScheme() {
 			String scheme = captureComponent("scheme");
-			this.scheme = (!scheme.startsWith("{") ? scheme.toLowerCase(Locale.ROOT) : scheme);
+			this.scheme = (!scheme.contains("{") ? scheme.toLowerCase(Locale.ROOT) : scheme);
 			return this;
 		}
 

diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -47,6 +47,7 @@
  * @author Juergen Hoeller
  * @author Sam Brannen
  * @author David Eckel
+ * @author Yanming Zhou
  */
 class UriComponentsBuilderTests {
 
@@ -637,6 +638,24 @@ void schemeVariableMixedCase(ParserType parserType) {
 				.buildAndExpand(Map.of("TheScheme", "ws"))
 				.toUri();
 		assertThat(uri.toString()).isEqualTo("ws://example.org");
+
+		uri = UriComponentsBuilder
+				.fromUriString("{TheScheme}s://example.org", parserType)
+				.buildAndExpand(Map.of("TheScheme", "ws"))
+				.toUri();
+		assertThat(uri.toString()).isEqualTo("wss://example.org");
+
+		uri = UriComponentsBuilder
+				.fromUriString("s{TheScheme}://example.org", parserType)
+				.buildAndExpand(Map.of("TheScheme", "ws"))
+				.toUri();
+		assertThat(uri.toString()).isEqualTo("sws://example.org");
+
+		uri = UriComponentsBuilder
+				.fromUriString("s{TheScheme}s://example.org", parserType)
+				.buildAndExpand(Map.of("TheScheme", "ws"))
+				.toUri();
+		assertThat(uri.toString()).isEqualTo("swss://example.org");
 	}
 
 	@ParameterizedTest