Add temporary debugging.

diff --git a/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java b/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java
new file mode 100644 (file)
index 0000000..ee47b73
--- /dev/null
+++ b/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java
@@ -0,0 +1,12 @@
+package org.collectionspace.authentication.spring;
+
+import org.springframework.web.cors.CorsConfiguration;
+
+public class CSpaceCorsConfiguration extends CorsConfiguration {
+    @Override
+    public String checkOrigin(String origin) {
+      System.out.println("origin=[" + origin + "]");
+
+      return super.checkOrigin(origin);
+    }
+}

diff --git a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
index 9056f5140c9d3c1c909611511b59862453ee6e2b..efc0e41b0952d5e05cb7109fc0ac109bdfd182f4 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
@@ -32,6 +32,7 @@ import javax.sql.DataSource;
 
 import org.apache.commons.io.IOUtils;
 import org.collectionspace.authentication.CSpaceUser;
+import org.collectionspace.authentication.spring.CSpaceCorsConfiguration;
 import org.collectionspace.authentication.spring.CSpaceDaoAuthenticationProvider;
 import org.collectionspace.authentication.spring.CSpaceJwtAuthenticationToken;
 import org.collectionspace.authentication.spring.CSpaceLogoutSuccessHandler;
@@ -168,7 +169,7 @@ public class SecurityConfig {
        }
 
        private CorsConfiguration defaultCorsConfiguration(List<String> allowedOrigins, Duration maxAge) {
-               CorsConfiguration configuration = new CorsConfiguration();
+               CorsConfiguration configuration = new CSpaceCorsConfiguration();
 
                configuration.setAllowedOrigins(allowedOrigins);
 
@@ -198,7 +199,7 @@ public class SecurityConfig {
        }
 
        private CorsConfiguration oauthServerCorsConfiguration(List<String> allowedOrigins, Duration maxAge) {
-               CorsConfiguration configuration = new CorsConfiguration();
+               CorsConfiguration configuration = new CSpaceCorsConfiguration();
 
                configuration.setAllowedOrigins(allowedOrigins);
 
@@ -250,6 +251,14 @@ public class SecurityConfig {
                                                @Override
                                                @Nullable
                                                public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
+                                                       String scheme = request.getScheme();
+                                                       String host = request.getServerName();
+                                                       int port = request.getServerPort();
+
+                                                       System.out.println("scheme=[" + scheme + "]");
+                                                       System.out.println("host=[" + host + "]");
+                                                       System.out.println("port=[" + port + "]");
+
                                                        return SecurityConfig.this.oauthServerCorsConfiguration;
                                                }
                                        });
@@ -395,6 +404,14 @@ public class SecurityConfig {
                                                @Override
                                                @Nullable
                                                public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
+                                                       String scheme = request.getScheme();
+                                                       String host = request.getServerName();
+                                                       int port = request.getServerPort();
+
+                                                       System.out.println("scheme=[" + scheme + "]");
+                                                       System.out.println("host=[" + host + "]");
+                                                       System.out.println("port=[" + port + "]");
+
                                                        return SecurityConfig.this.defaultCorsConfiguration;
                                                }
                                        });