Remove path variables from pathWithinMapping

Closes gh-27913
spring-projects · Feb 14, 2022 · ec03e88 · ec03e88
1 parent 11cb938
commit ec03e88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...bmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/...bmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -28,7 +28,6 @@
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
-import org.springframework.http.server.PathContainer;
 import org.springframework.http.server.RequestPath;
 import org.springframework.lang.Nullable;
 import org.springframework.util.AntPathMatcher;
@@ -216,8 +215,9 @@ protected Object lookupHandler(
 			handler = obtainApplicationContext().getBean(handlerName);
 		}
 		validateHandler(handler, request);
-		PathContainer pathWithinMapping = pattern.extractPathWithinPattern(path.pathWithinApplication());
-		return buildPathExposingHandler(handler, pattern.getPatternString(), pathWithinMapping.value(), null);
+		String pathWithinMapping = pattern.extractPathWithinPattern(path.pathWithinApplication()).value();
+		pathWithinMapping = UrlPathHelper.defaultInstance.removeSemicolonContent(pathWithinMapping);
+		return buildPathExposingHandler(handler, pattern.getPatternString(), pathWithinMapping, null);
 	}
 
 	/**

diff --git a/...c/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/...c/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -102,7 +102,7 @@ void checkMappings(String beanName) throws Exception {
 		assertThat(request.getAttribute(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/welcome.html");
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(bean);
 
-		request = PathPatternsTestUtils.initRequest("GET", "/welcome.x", usePathPatterns);
+		request = PathPatternsTestUtils.initRequest("GET", "/welcome.x;jsessionid=123", usePathPatterns);
 		chain = getHandler(hm, request);
 		assertThat(chain.getHandler()).isSameAs(otherBean);
 		assertThat(request.getAttribute(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("welcome.x");