100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
CORS bug fix
Rich Turner7a2c217217dd
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.javaindex b854b35ec..26f386e92 100644--- a/container/src/main/java/org/openremote/container/web/WebService.java+++ b/container/src/main/java/org/openremote/container/web/WebService.java@@ -272,32 +272,32 @@ public abstract class WebService implements ContainerService {return resteasyDeployment;}-- protected FilterInfo createCorsFilter(Container container) {-- if (corsFilterInfo == null) {-- CORSFilter corsFilter = new CORSFilter();+ protected void createCorsFilter(Container container) {+ CORSFilter corsFilter = null;++ if (!devMode) {+ String allowedOriginsStr = getString(container.getConfig(), WEBSERVER_ALLOWED_ORIGINS, WEBSERVER_ALLOWED_ORIGINS_DEFAULT);+ if (allowedOriginsStr != null) {+ corsFilter = new CORSFilter();+ corsFilter.setAllowCredentials(true);+ corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");+ corsFilter.setExposedHeaders("*");+ corsFilter.setCorsMaxAge(1209600);+ String[] allowedOrigins = allowedOriginsStr.split(";");+ corsFilter.getAllowedOrigins().addAll(Arrays.asList(allowedOrigins));+ }+ } else {+ corsFilter = new CORSFilter();+ corsFilter.getAllowedOrigins().add("*");corsFilter.setAllowCredentials(true);- corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");corsFilter.setExposedHeaders("*");+ corsFilter.setAllowedMethods("GET, POST, PUT, DELETE, OPTIONS, HEAD");corsFilter.setCorsMaxAge(1209600);-- if (!devMode) {- String allowedOriginsStr = getString(container.getConfig(), WEBSERVER_ALLOWED_ORIGINS, WEBSERVER_ALLOWED_ORIGINS_DEFAULT);- if (allowedOriginsStr != null) {- String[] allowedOrigins = allowedOriginsStr.split(";");- Arrays.stream(allowedOrigins).forEach(allowedOrigin ->- corsFilter.getAllowedOrigins().add(allowedOrigin)- );- }- } else {- corsFilter.getAllowedOrigins().add("*");- }-- corsFilterInfo = Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(corsFilter));}- return corsFilterInfo;+ if (corsFilter != null) {+ CORSFilter finalCorsFilter = corsFilter;+ corsFilterInfo = Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(finalCorsFilter));+ }}}