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

Expand range of whitelisted extensions by media type

Browse Source 
This commit expands the range of whitelisted extensions by checking
if an extension can be resolved to image/*, audio/*, video/*, as well
as any content type that ends with +xml.

Issue: SPR-13643
This commit is contained in:
Rossen Stoyanchev
2015-11-11 17:46:36 -05:00
parent cde4431c80
commit f5f57e9544
3 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
View File

@@ -47,7 +47,17 @@ public abstract class AbstractMappingContentNegotiationStrategy extends MappingM
@Override
public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) throws HttpMediaTypeNotAcceptableException {
String key = getMediaTypeKey(webRequest);
return resolveMediaTypeKey(webRequest, getMediaTypeKey(webRequest));
}
/**
* An alternative to {@link #resolveMediaTypes(NativeWebRequest)} that accepts
* an already extracted key.
* @since 3.2.16
*/
public List<MediaType> resolveMediaTypeKey(NativeWebRequest webRequest, String key)
throws HttpMediaTypeNotAcceptableException {
if (StringUtils.hasText(key)) {
MediaType mediaType = lookupMediaType(key);
if (mediaType != null) {

8
spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManager.java
View File

@@ -99,6 +99,14 @@ public class ContentNegotiationManager implements ContentNegotiationStrategy, Me
}
/**
* Return the configured content negotiation strategies.
* @since 3.2.16
*/
public List<ContentNegotiationStrategy> getStrategies() {
return this.contentNegotiationStrategies;
}
/**
* Add MediaTypeFileExtensionResolver instances.
* <p>Note that some {@link ContentNegotiationStrategy} implementations also