SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include contextPath in eurekaVersionFilter computed path

Browse Source 
Fixes gh-4154
This commit is contained in:
spencergibb
2023-03-03 22:21:03 -05:00
parent fa07416bd8
commit 0dca49318c
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java
View File

@@ -246,12 +246,15 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
}
@Bean
public FilterRegistrationBean<?> eurekaVersionFilterRegistration(ServerProperties serverProperties) {
String contextPath = serverProperties.getServlet().getContextPath();
public FilterRegistrationBean<?> eurekaVersionFilterRegistration(ServerProperties serverProperties,
Environment env) {
final String contextPath = serverProperties.getServlet().getContextPath();
String regex = EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN;
if (StringUtils.hasText(contextPath)) {
regex = contextPath + regex;
}
String debugResponseHeader = env.getProperty("eureka.server.version.filter.debug.response-header");
boolean addDebugResponseHeader = StringUtils.hasText(debugResponseHeader);
Pattern staticPattern = Pattern.compile(regex);
FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
bean.setFilter(new OncePerRequestFilter() {
@@ -264,18 +267,29 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
// don't forward static requests (images, js, etc...) to /v2
&& !staticPattern.matcher(requestURI).matches()) {
String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2"
+ requestURI.substring(EurekaConstants.DEFAULT_PREFIX.length());
String prefix = EurekaConstants.DEFAULT_PREFIX;
if (StringUtils.hasText(contextPath)) {
prefix = contextPath + prefix;
}
String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2" + requestURI.substring(prefix.length());
if (StringUtils.hasText(contextPath)) {
updatedPath = contextPath + updatedPath;
}
final String computedPath = updatedPath;
// only used if a special debug property is set, so in prod this is
// always skipped.
if (addDebugResponseHeader) {
response.addHeader(debugResponseHeader, computedPath);
}
HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request) {
@Override
public String getRequestURI() {
return updatedPath;
return computedPath;
}
@Override
public String getServletPath() {
return updatedPath;
return computedPath;
}
};
req = wrapper;

5
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java
View File

@@ -40,7 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
properties = { "spring.application.name=eureka", "server.servlet.context-path=/context",
"management.security.enabled=false", "management.endpoints.web.exposure.include=*" })
"management.security.enabled=false", "management.endpoints.web.exposure.include=*",
"eureka.server.version.filter.debug.response-header=X-Version-Filter-Computed-Path" })
class ApplicationContextTests {
private static final String BASE_PATH = new WebEndpointProperties().getBasePath();
@@ -54,6 +55,8 @@ class ApplicationContextTests {
ResponseEntity<Map> entity = new TestRestTemplate()
.getForEntity("http://localhost:" + this.port + "/context/eureka/apps", Map.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
String computedPath = entity.getHeaders().getFirst("X-Version-Filter-Computed-Path");
assertThat(computedPath).isEqualTo("/context/eureka/v2/apps");
}
@Test