Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source 
Consolidate into one method potentially re-using UriComponentsBuilder
for the location. Also use StringUtils#applyRelativePath.

Issue: SPR-15020
This commit is contained in:
Rossen Stoyanchev
2016-12-15 17:45:17 -05:00
parent db2ebd30da
commit 95818609fc
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -35,6 +34,7 @@ import org.springframework.http.HttpRequest;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedCaseInsensitiveMap;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
import org.springframework.web.util.UrlPathHelper;
@@ -230,10 +230,12 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
}
private static class ForwardedHeaderResponseWrapper extends HttpServletResponseWrapper {
private static final String FOLDER_SEPARATOR = "/";
private final HttpServletRequest request;
public ForwardedHeaderResponseWrapper(HttpServletResponse response, HttpServletRequest request) {
super(response);
this.request = request;
@@ -241,46 +243,37 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
@Override
public void sendRedirect(String location) throws IOException {
String forwardedLocation = forwardedLocation(location);
super.sendRedirect(forwardedLocation);
}
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(location);
private String forwardedLocation(String location) {
if(hasScheme(location)) {
return location;
// Absolute location
if (builder.build().getScheme() != null) {
super.sendRedirect(location);
return;
}
return createForwardedLocation(location);
}
private String createForwardedLocation(String location) {
boolean isNetworkPathReference = location.startsWith("//");
if(isNetworkPathReference) {
UriComponentsBuilder schemeForwardedLocation = UriComponentsBuilder.fromUriString(location).scheme(request.getScheme());
return schemeForwardedLocation.toUriString();
// Network-path reference
if(location.startsWith("//")) {
String scheme = this.request.getScheme();
super.sendRedirect(builder.scheme(scheme).toUriString());
return;
}
HttpRequest httpRequest = new ServletServerHttpRequest(request);
UriComponentsBuilder forwardedLocation = UriComponentsBuilder.fromHttpRequest(httpRequest);
boolean isRelativeToContextPath = location.startsWith(FOLDER_SEPARATOR);
if(isRelativeToContextPath) {
forwardedLocation.replacePath(request.getContextPath());
} else if(endsWithFileSpecificPart(forwardedLocation)) {
// remove a file specific part from existing request
forwardedLocation.path("/../");
// Relative to Servlet container root or to current request
String path;
if (location.startsWith(FOLDER_SEPARATOR)) {
path = this.request.getContextPath() + location;
}
else {
path = StringUtils.applyRelativePath(this.request.getRequestURI(), location);
}
forwardedLocation.path(location);
return forwardedLocation.build().normalize().toUriString();
}
private boolean endsWithFileSpecificPart(UriComponentsBuilder forwardedLocation) {
return !forwardedLocation.build().getPath().endsWith(FOLDER_SEPARATOR);
}
String result = UriComponentsBuilder
.fromHttpRequest(new ServletServerHttpRequest(this.request))
.replacePath(path)
.build().normalize().toUriString();
private boolean hasScheme(String location) {
String locationScheme = UriComponentsBuilder.fromUriString(location).build().getScheme();
return locationScheme != null;
super.sendRedirect(result);
}
}