Skip to content

Commit 2bed0a7

Browse files
committed
Added some domain for CORS access control
1 parent 1f36150 commit 2bed0a7

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/main/java/com/browserstack/automate/ci/jenkins/observability/AccessControlsFilter.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Arrays;
2727
import java.util.Collections;
2828
import java.util.List;
29+
import java.util.Set;
2930
import java.util.logging.Logger;
3031

3132
/**
@@ -65,12 +66,23 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
6566
HttpServletRequest req = (HttpServletRequest) request;
6667
HttpServletResponse resp = (HttpServletResponse) response;
6768

68-
resp.addHeader("Access-Control-Allow-Credentials", "true");
69-
resp.addHeader("Access-Control-Allow-Origin", "https://observability.browserstack.com");
70-
resp.addHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT");
71-
resp.addHeader("Access-Control-Allow-Headers", "*");
72-
resp.addHeader("Access-Control-Expose-Headers", "*");
73-
resp.addHeader("Access-Control-Max-Age", "999");
69+
Set<String> allowedOrigins = Set.of(
70+
"https://observability.browserstack.com",
71+
"https://automation.browserstack.com",
72+
"https://automate.browserstack.com",
73+
"https://app-automate.browserstack.com",
74+
"https://test-management.browserstack.com"
75+
);
76+
77+
String origin = req.getHeader("Origin");
78+
if (origin != null && allowedOrigins.contains(origin)) {
79+
resp.addHeader("Access-Control-Allow-Credentials", "true");
80+
resp.addHeader("Access-Control-Allow-Origin", origin);
81+
resp.addHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT");
82+
resp.addHeader("Access-Control-Allow-Headers", "*");
83+
resp.addHeader("Access-Control-Expose-Headers", "*");
84+
resp.addHeader("Access-Control-Max-Age", "999");
85+
}
7486

7587
if (req.getMethod().equals(PREFLIGHT_REQUEST)) {
7688
resp.setStatus(200);

0 commit comments

Comments
 (0)