From 8feeb70c34604a4cf7ff669e38815aa55a62a306 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Mon, 2 Nov 2026 14:26:05 +0100 Subject: [PATCH 1/2] Allow cors requests --- src/main/java/org/phoebus/pvws/WebSocketConfig.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/phoebus/pvws/WebSocketConfig.java b/src/main/java/org/phoebus/pvws/WebSocketConfig.java index 2f4c6a2..8e95ab7 100644 --- a/src/main/java/org/phoebus/pvws/WebSocketConfig.java +++ b/src/main/java/org/phoebus/pvws/WebSocketConfig.java @@ -21,6 +21,7 @@ import org.phoebus.pvws.ws.PvSocketHandler; import org.phoebus.pvws.ws.WebSocket; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; @@ -43,10 +44,18 @@ public class WebSocketConfig implements WebSocketConfigurer { @Autowired private PvSocketHandler pvSocketHandler; + @Value("${cors.allowed.origins}") + private String allowedOrigins; + private final Logger logger = Logger.getLogger(WebSocketConfig.class.getName()); @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(pvSocketHandler, "/pv"); + if(allowedOrigins != null && !allowedOrigins.isEmpty()) { + registry.addHandler(pvSocketHandler, "/pv").setAllowedOriginPatterns(allowedOrigins.trim()); + } + else{ + registry.addHandler(pvSocketHandler, "/pv"); + } } } From b5cbccc1512b00f73e7c85d61d23a9909cf68ac9 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Mon, 2 Nov 2026 14:35:53 +0100 Subject: [PATCH 2/2] Need a default value (empty string) for cors.allowed.orgins --- src/main/java/org/phoebus/pvws/WebSocketConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/phoebus/pvws/WebSocketConfig.java b/src/main/java/org/phoebus/pvws/WebSocketConfig.java index 8e95ab7..6debf46 100644 --- a/src/main/java/org/phoebus/pvws/WebSocketConfig.java +++ b/src/main/java/org/phoebus/pvws/WebSocketConfig.java @@ -44,7 +44,7 @@ public class WebSocketConfig implements WebSocketConfigurer { @Autowired private PvSocketHandler pvSocketHandler; - @Value("${cors.allowed.origins}") + @Value("${cors.allowed.origins:}") private String allowedOrigins; private final Logger logger = Logger.getLogger(WebSocketConfig.class.getName());