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

WebSessionServerRequestCache ignores favicon and html

Browse Source 
Fixes: gh-5874
This commit is contained in:
Rob Winch
2018-09-19 14:28:05 -05:00
parent 8e4d540bfb
commit e4597b5213
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java
View File

@@ -19,7 +19,11 @@ package org.springframework.security.web.server.savedrequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.security.web.server.util.matcher.AndServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.MediaTypeServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers;
import org.springframework.util.Assert;
@@ -28,6 +32,7 @@ import org.springframework.web.server.WebSession;
import reactor.core.publisher.Mono;
import java.net.URI;
import java.util.Collections;
/**
* An implementation of {@link ServerRequestCache} that saves the
@@ -45,8 +50,7 @@ public class WebSessionServerRequestCache implements ServerRequestCache {
private String sessionAttrName = DEFAULT_SAVED_REQUEST_ATTR;
private ServerWebExchangeMatcher saveRequestMatcher = ServerWebExchangeMatchers.pathMatchers(
HttpMethod.GET, "/**");
private ServerWebExchangeMatcher saveRequestMatcher = createDefaultRequestMacher();
/**
* Sets the matcher to determine if the request should be saved. The default is to match
@@ -88,4 +92,12 @@ public class WebSessionServerRequestCache implements ServerRequestCache {
private static String pathInApplication(ServerHttpRequest request) {
return request.getPath().pathWithinApplication().value();
}
private static ServerWebExchangeMatcher createDefaultRequestMacher() {
ServerWebExchangeMatcher get = ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/**");
ServerWebExchangeMatcher notFavicon = new NegatedServerWebExchangeMatcher(ServerWebExchangeMatchers.pathMatchers("/favicon.*"));
MediaTypeServerWebExchangeMatcher html = new MediaTypeServerWebExchangeMatcher(MediaType.TEXT_HTML);
html.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
return new AndServerWebExchangeMatcher(get, notFavicon, html);
}
}