root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Correctly decode URL coming into the Jolokia endpoint 

fixes #869
This commit is contained in:
Christian Dupuis 2014-05-15 17:28:49 +02:00
parent e695e5d637
commit 875e77d420
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java
View File

@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.ServletContextAware; import org.springframework.web.context.ServletContextAware;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.ServletWrappingController; import org.springframework.web.servlet.mvc.ServletWrappingController;
import org.springframework.web.util.UrlPathHelper;
/** /**
* {@link MvcEndpoint} to expose Jolokia. * {@link MvcEndpoint} to expose Jolokia.
@ -124,15 +125,18 @@ public class JolokiaMvcEndpoint implements MvcEndpoint, InitializingBean,
private static class PathStripper extends HttpServletRequestWrapper { private static class PathStripper extends HttpServletRequestWrapper {
private final String path; private final String path;
private final UrlPathHelper urlPathHelper;
public PathStripper(HttpServletRequest request, String path) { public PathStripper(HttpServletRequest request, String path) {
super(request); super(request);
this.path = path; this.path = path;
this.urlPathHelper = new UrlPathHelper();
} }
@Override @Override
public String getPathInfo() { public String getPathInfo() {
String value = super.getRequestURI(); String value = this.urlPathHelper.decodeRequestString(
(HttpServletRequest) getRequest(), super.getRequestURI());
if (value.contains(this.path)) { if (value.contains(this.path)) {
value = value.substring(value.indexOf(this.path) + this.path.length()); value = value.substring(value.indexOf(this.path) + this.path.length());
} }
@ -145,6 +149,6 @@ public class JolokiaMvcEndpoint implements MvcEndpoint, InitializingBean,
} }
return value; return value;
} }
}
} }
}