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

Polish CORS support

This commit is contained in:
Sebastien Deleuze 2015-07-10 15:32:34 +02:00
parent 9c46228a97
commit 882fe129f3
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
View File

@ -39,7 +39,7 @@ import org.springframework.core.annotation.AliasFor;
@Documented @Documented
public @interface CrossOrigin { public @interface CrossOrigin {
String[] DEFAULT_ORIGIN = { "*" }; String[] DEFAULT_ORIGINS = { "*" };
String[] DEFAULT_ALLOWED_HEADERS = { "*" }; String[] DEFAULT_ALLOWED_HEADERS = { "*" };

5
spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
View File

@ -42,11 +42,6 @@ public class CorsConfiguration {
*/ */
public static final String ALL = "*"; public static final String ALL = "*";
/**
* Default maximum age (30 minutes).
*/
public static final Long DEFAULT_MAX_AGE = Long.valueOf(1800);
private List<String> allowedOrigins; private List<String> allowedOrigins;
private List<String> allowedMethods; private List<String> allowedMethods;

14
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfiguration;
/** /**
@ -49,13 +50,12 @@ public class CorsRegistration {
this.pathPattern = pathPattern; this.pathPattern = pathPattern;
// Same implicit default values as the @CrossOrigin annotation + allows simple methods // Same implicit default values as the @CrossOrigin annotation + allows simple methods
this.config = new CorsConfiguration(); this.config = new CorsConfiguration();
this.config.addAllowedOrigin(CorsConfiguration.ALL); this.config.setAllowedOrigins(Arrays.asList(CrossOrigin.DEFAULT_ORIGINS));
this.config.addAllowedMethod(HttpMethod.GET); this.config.setAllowedMethods(Arrays.asList(HttpMethod.GET.name(),
this.config.addAllowedMethod(HttpMethod.HEAD); HttpMethod.HEAD.name(), HttpMethod.POST.name()));
this.config.addAllowedMethod(HttpMethod.POST); this.config.setAllowedHeaders(Arrays.asList(CrossOrigin.DEFAULT_ALLOWED_HEADERS));
this.config.addAllowedHeader(CorsConfiguration.ALL); this.config.setAllowCredentials(CrossOrigin.DEFAULT_ALLOW_CREDENTIALS);
this.config.setAllowCredentials(Boolean.TRUE); this.config.setMaxAge(CrossOrigin.DEFAULT_MAX_AGE);
this.config.setMaxAge(CorsConfiguration.DEFAULT_MAX_AGE);
} }
public CorsRegistration allowedOrigins(String... origins) { public CorsRegistration allowedOrigins(String... origins) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
View File

@ -300,7 +300,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
updateCorsConfig(config, methodAnnotation); updateCorsConfig(config, methodAnnotation);
if (CollectionUtils.isEmpty(config.getAllowedOrigins())) { if (CollectionUtils.isEmpty(config.getAllowedOrigins())) {
config.setAllowedOrigins(Arrays.asList(CrossOrigin.DEFAULT_ORIGIN)); config.setAllowedOrigins(Arrays.asList(CrossOrigin.DEFAULT_ORIGINS));
} }
if (CollectionUtils.isEmpty(config.getAllowedMethods())) { if (CollectionUtils.isEmpty(config.getAllowedMethods())) {
for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) { for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) {