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

Fix CachingResourceResolver key generation

Browse Source 
When used in combination with GzipResourceResolver, the
CachingResourceResolver does not properly cache results, since it only
takes the request path as a input for cache key generation.

Here's an example of that behavior:

1. an HTTP client requests a resource with `Accept-Encoding: gzip`, so
the GzipResourceResolver can resolve a gzipped resource.
2. the configured CachingResourceResolver caches that resource.
3. another HTTP client requests the same resource, but it does not
support gzip encoding; the previously cached gzipped resource is still
returned.

This commit uses the presence/absence of gzip encoding support as an
input in cache keys generation.

Issue: SPR-12982
This commit is contained in:
Brian Clozel
2015-05-04 11:26:35 +02:00
parent 3abcea1296
commit bb3f26483b
3 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
* delegates to the resolver chain and saves the result in the cache.
*
* @author Rossen Stoyanchev
* @author Brian Clozel
* @since 4.1
*/
public class CachingResourceResolver extends AbstractResourceResolver {
@@ -61,7 +62,7 @@ public class CachingResourceResolver extends AbstractResourceResolver {
protected Resource resolveResourceInternal(HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {
String key = RESOLVED_RESOURCE_CACHE_KEY_PREFIX + requestPath;
String key = computeKey(request, requestPath);
Resource resource = this.cache.get(key, Resource.class);
if (resource != null) {
@@ -82,6 +83,18 @@ public class CachingResourceResolver extends AbstractResourceResolver {
return resource;
}
protected String computeKey(HttpServletRequest request, String requestPath) {
StringBuilder key = new StringBuilder(RESOLVED_RESOURCE_CACHE_KEY_PREFIX);
key.append(requestPath);
if(request != null) {
String encoding = request.getHeader("Accept-Encoding");
if(encoding != null && encoding.contains("gzip")) {
key.append("+encoding=gzip");
}
}
return key.toString();
}
@Override
protected String resolveUrlPathInternal(String resourceUrlPath,
List<? extends Resource> locations, ResourceResolverChain chain) {