Skip to content

fix(dev): restrict default CORS origins and WebSocket allowed origins to localhost #1222

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
g0w6y wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

fix(dev): restrict default CORS origins and WebSocket allowed origins to localhost #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion dev/src/main/java/com/google/adk/web/config/AdkWebCorsProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ public record AdkWebCorsProperties(

public AdkWebCorsProperties {
mapping = mapping != null ? mapping : "/**";
origins = origins != null && !origins.isEmpty() ? origins : List.of("*");
origins =
origins != null && !origins.isEmpty()
? origins
: List.of("http://localhost:8080", "http://127.0.0.1:8080");
methods =
methods != null && !methods.isEmpty()
? methods
Expand Down
10 changes: 8 additions & 2 deletions dev/src/main/java/com/google/adk/web/websocket/WebSocketConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.google.adk.web.websocket;

import com.google.adk.web.config.AdkWebCorsProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
Expand All @@ -28,14 +29,19 @@
public class WebSocketConfig implements WebSocketConfigurer {

private final LiveWebSocketHandler liveWebSocketHandler;
private final AdkWebCorsProperties corsProperties;

@Autowired
public WebSocketConfig(LiveWebSocketHandler liveWebSocketHandler) {
public WebSocketConfig(
LiveWebSocketHandler liveWebSocketHandler, AdkWebCorsProperties corsProperties) {
this.liveWebSocketHandler = liveWebSocketHandler;
this.corsProperties = corsProperties;
}

@Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
registry.addHandler(liveWebSocketHandler, "/run_live").setAllowedOrigins("*");
registry
.addHandler(liveWebSocketHandler, "/run_live")
.setAllowedOrigins(corsProperties.origins().toArray(new String[0]));
}
}