Skip to content

Allow cors requests #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
georgweiss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow cors requests #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8feeb70
Allow cors requests
georgweiss Nov 2, 2026
b5cbccc
Need a default value (empty string) for cors.allowed.orgins
georgweiss Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/phoebus/pvws/WebSocketConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
}
}
}
Loading