Skip to content
Snippets Groups Projects
Commit 7a2bcb99 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Fix CORS

Setting 'security.cors.origins' did not have any effect since the the
configuration was overriden by the default path settings.
parent 64ef726a
Branches
Tags
No related merge requests found
Pipeline #13282 passed with stages
in 1 minute and 50 seconds
...@@ -33,8 +33,8 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter { ...@@ -33,8 +33,8 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter {
} }
private static UrlBasedCorsConfigurationSource configurationSource(List<String> origins) { private static UrlBasedCorsConfigurationSource configurationSource(List<String> origins) {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config; CorsConfiguration config;
UrlBasedCorsConfigurationSource source;
/* Grant full access from specified origins */ /* Grant full access from specified origins */
config = new CorsConfiguration(); config = new CorsConfiguration();
...@@ -47,7 +47,6 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter { ...@@ -47,7 +47,6 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter {
config.addAllowedMethod("PUT"); config.addAllowedMethod("PUT");
config.addAllowedMethod("DELETE"); config.addAllowedMethod("DELETE");
config.setAllowCredentials(true); config.setAllowCredentials(true);
source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config); source.registerCorsConfiguration("/**", config);
/* Grant limited access from all origins */ /* Grant limited access from all origins */
...@@ -57,7 +56,6 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter { ...@@ -57,7 +56,6 @@ public class CorsFilter extends org.springframework.web.filter.CorsFilter {
config.addAllowedHeader("X-Requested-With"); config.addAllowedHeader("X-Requested-With");
config.addAllowedMethod("GET"); config.addAllowedMethod("GET");
config.setAllowCredentials(true); config.setAllowCredentials(true);
source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/", config); source.registerCorsConfiguration("/", config);
source.registerCorsConfiguration("/arsnova-config", config); source.registerCorsConfiguration("/arsnova-config", config);
source.registerCorsConfiguration("/configuration/", config); source.registerCorsConfiguration("/configuration/", config);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment