Skip to content
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

Remove endpoint regex from cors filter #7108

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Remove endpoint regex from cors filter #7108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdb018b
removed endpoint regex from cors filter
Oct 18, 2024
3553397
merged main
Oct 18, 2024
0dfe7cb
Merge branch 'main' into removeEndpointRegexFromCorsFilter
amontenegro Oct 29, 2024
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
36 changes: 10 additions & 26 deletions orcid-core/src/main/java/org/orcid/core/web/filters/CorsFilterWeb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,29 @@
import org.springframework.web.filter.OncePerRequestFilter;

/**
*
* @author Robert Peters (rcpeters)
*
*/

public class CorsFilterWeb extends OncePerRequestFilter {

@Resource
CrossDomainWebManger crossDomainWebManger;

private static final String LOCALHOST_BASE_URI= "https://localhost";
private static final String LOCALHOST_ORCID_WEB_BASE_URI = "https://localhost:8443/orcid-web";


@Value("${org.orcid.core.baseUri}")
private String baseUri;

@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
Pattern p = Pattern.compile("^/userStatus\\.json|^/oauth/userinfo|^/oauth/jwks|^/\\.well-known/openid-configuration");
Matcher m = p.matcher(OrcidUrlManager.getPathWithoutContextPath(request));
// Allow CORS for all paths from Angular frontend only if we are in local dev env
// All other envs allow CORS only if request path matches one of:
// userStatus.json
// /oauth/userinfo
// /oauth/jwks
// /.well-known/openid-configuration
if (baseUri.equals(LOCALHOST_BASE_URI) || baseUri.equals(LOCALHOST_ORCID_WEB_BASE_URI) || m.matches()) {
if (crossDomainWebManger.allowed(request)) {
String origin = request.getHeader("origin");
response.addHeader("Access-Control-Allow-Origin", origin);
response.addHeader("Access-Control-Allow-Credentials", "true");

if (request.getHeader("Access-Control-Request-Method") != null && "OPTIONS".equals(request.getMethod())) {
// CORS "pre-flight" request
response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
response.addHeader("Access-Control-Allow-Headers", "X-Requested-With,Origin,Content-Type,Accept,Authorization,x-csrf-token");
}
if (crossDomainWebManger.allowed(request)) {
String origin = request.getHeader("origin");
response.addHeader("Access-Control-Allow-Origin", origin);
response.addHeader("Access-Control-Allow-Credentials", "true");

if (request.getHeader("Access-Control-Request-Method") != null && "OPTIONS".equals(request.getMethod())) {
// CORS "pre-flight" request
response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
response.addHeader("Access-Control-Allow-Headers", "X-Requested-With,Origin,Content-Type,Accept,Authorization,x-csrf-token");
}

}

filterChain.doFilter(request, response);
Expand Down
4 changes: 2 additions & 2 deletions properties/development.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ org.orcid.core.node = 1
org.orcid.core.numberOfNodes = 1

# CORS allowed domains
org.orcid.security.cors.allowed_domains=localhost
org.orcid.security.cors.allowed_domains=dev.orcid.org

# Messaging
# Replace with tcp://domain.com:61616 in live to point at ActiveMQ location
Expand Down Expand Up @@ -260,8 +260,8 @@ org.orcid.core.autospam.webhookUrl=

org.orcid.persistence.liquibase.enabled=false
org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr

org.orcid.persistence.panoply.cleanup.production=false

# Panoply redshift database
org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
org.orcid.core.utils.panoply.maxPoolSize=20
Expand Down
Loading