Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>browserstack-integration</artifactId>
<version>1.2.18-SNAPSHOT</version>
<version>1.2.19-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>BrowserStack</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.ObjectStreamException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.*;
import java.util.logging.Logger;

/**
Expand Down Expand Up @@ -65,12 +63,23 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response;

resp.addHeader("Access-Control-Allow-Credentials", "true");
resp.addHeader("Access-Control-Allow-Origin", "https://observability.browserstack.com");
resp.addHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT");
resp.addHeader("Access-Control-Allow-Headers", "*");
resp.addHeader("Access-Control-Expose-Headers", "*");
resp.addHeader("Access-Control-Max-Age", "999");
Set<String> allowedOrigins = new HashSet<String>(Arrays.asList(
"https://observability.browserstack.com",
"https://automation.browserstack.com",
"https://automate.browserstack.com",
"https://app-automate.browserstack.com",
"https://test-management.browserstack.com"
));

String origin = req.getHeader("Origin");
if (origin != null && allowedOrigins.contains(origin)) {
resp.addHeader("Access-Control-Allow-Credentials", "true");
resp.addHeader("Access-Control-Allow-Origin", origin);
resp.addHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT");
resp.addHeader("Access-Control-Allow-Headers", "*");
resp.addHeader("Access-Control-Expose-Headers", "*");
resp.addHeader("Access-Control-Max-Age", "999");
}

if (req.getMethod().equals(PREFLIGHT_REQUEST)) {
resp.setStatus(200);
Expand Down