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
Hotfix for wildcard CORS configuration when OR_HOSTNAME and/or OR_ADDTIONAL_HOSTNAMES also set (#2366)
Rich Turnere5576549e38b
diff --git a/container/src/main/java/org/openremote/container/web/CORSConfig.java b/container/src/main/java/org/openremote/container/web/CORSConfig.javaindex ab9850d0a..17c412727 100644--- a/container/src/main/java/org/openremote/container/web/CORSConfig.java+++ b/container/src/main/java/org/openremote/container/web/CORSConfig.java@@ -118,7 +118,11 @@ public class CORSConfig {String allowedOriginsStr = Config.getString(OR_WEBSERVER_ALLOWED_ORIGINS, null);if (!TextUtil.isNullOrEmpty(allowedOriginsStr)) {- allowedOrigins.addAll(Arrays.stream(allowedOriginsStr.split(",")).toList());+ if (allowedOriginsStr.equals(DEFAULT_CORS_ALLOW_ALL)) {+ allowedOrigins = Set.of(DEFAULT_CORS_ALLOW_ALL);+ } else {+ allowedOrigins.addAll(Arrays.stream(allowedOriginsStr.split(",")).toList());+ }}return allowedOrigins;