From: Ray Lee <ray.lee@lyrasis.org>
Date: Fri, 22 Sep 2023 04:44:17 +0000 (-0400)
Subject: Add temporary debugging.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6f602f25ed6251097a889e48c2c2794ca25afe16;p=tmp%2Fjakarta-migration.git

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
index 000000000..ee47b7352
--- /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 9056f5140..efc0e41b0 100644
--- 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;
 						}
 					});