From 7b9dbeb5cf01c94fbcd55ebd09b783d417acb47c Mon Sep 17 00:00:00 2001
From: Jimmy Wu <jimmywu0605@gmail.com>
Date: Fri, 10 Jan 2025 17:55:17 -0500
Subject: [PATCH] remove duplicate ltpa config in nonFIPS case

---
 .../ws/security/token/ltpa/fat/LTPAKeyRotationTests.java | 6 +++++-
 .../publish/files/alternate/configuredValidation1.keys   | 9 ---------
 .../publish/files/alternate/server.xml                   | 4 ----
 .../files/alternate/serverWithLTPAFileMonitor.xml        | 4 ----
 .../serverWithLTPAFileMonitorAndWrongPassword.xml        | 4 ----
 5 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/configuredValidation1.keys

diff --git a/dev/com.ibm.ws.security.token.ltpa_fat/fat/src/com/ibm/ws/security/token/ltpa/fat/LTPAKeyRotationTests.java b/dev/com.ibm.ws.security.token.ltpa_fat/fat/src/com/ibm/ws/security/token/ltpa/fat/LTPAKeyRotationTests.java
index ade0a436575..c1cb9a3aaa8 100644
--- a/dev/com.ibm.ws.security.token.ltpa_fat/fat/src/com/ibm/ws/security/token/ltpa/fat/LTPAKeyRotationTests.java
+++ b/dev/com.ibm.ws.security.token.ltpa_fat/fat/src/com/ibm/ws/security/token/ltpa/fat/LTPAKeyRotationTests.java
@@ -197,7 +197,11 @@ public void finished(Description description) {
     @BeforeClass
     public static void setUp() throws Exception {
         // Copy validation key file (validation1.keys) to the server
-        copyFileToServerResourcesSecurityDir(ALT_CONFIGVALIDATION_KEY1_PATH);
+        if (fipsEnabled) {
+            copyFileToServerResourcesSecurityDir(ALT_CONFIGVALIDATION_KEY1_PATH);
+        } else {
+            copyFileToServerResourcesSecurityDir(ALT_VALIDATION_KEY1_PATH);
+        }
 
         server.setupForRestConnectorAccess();
         if (fipsEnabled)
diff --git a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/configuredValidation1.keys b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/configuredValidation1.keys
deleted file mode 100644
index bb42bc5c414..00000000000
--- a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/configuredValidation1.keys
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Dec 11 14:22:34 EST 2023
-# First Validation Key
-com.ibm.websphere.ltpa.version=1.0
-com.ibm.websphere.ltpa.3DESKey=+cZqCHdzLNY8GjY27CweEF8oRFwmvqbup7ji+BJPSDM\=
-com.ibm.websphere.ltpa.PrivateKey=fOkapN6/+jShRqyyMNI1YMk5Nj9fMfPUIoEYvizVdUDbjmsBBjIyWzYawH7TIa7Cz7/MbBBd7oGaawWetvcAVt1Ilu3wfG+qz+zZsEOp6fr4HUqG9h2N60RddrWaxEf7f8WKsTLf0/aSeIC29OogwCLpsHH2s0iTnWG/1UfnE2cCilkyen4v3tAQpZuyZbeP1ogfH5vDZNbbDivgS6o0fKzCV9OfRwLfcy8uYpYkAh1Ewl9XjV2k1MgvuV/Yye1AIbnX/MRw9a82TQ5a9j6jzaKUIRjXV7iWQXVCoS/iFDAXUdNYB+F2Foved01C4Fuh3KlAwFt5FuN9M0zsk5bK2t3aB/k79jbechdGTxzVdq4\=
-com.ibm.websphere.CreationHost=localhost
-com.ibm.websphere.ltpa.Realm=BasicRealm
-com.ibm.websphere.ltpa.PublicKey=AIFD6M04Gm11rSKCGd4le/E+5xgKUx9skKKKmAWa0Et6FGLMBF4tzwgS0jxwA7mMjYA6l5DkOUGQMUn83PdAUBlogO7dNy80chh+MbMgMMxIzgh6dKGPop+iC4X2GLmMY70vJA4fDSe/qk7CorDP8dj/+VRYmeN9DY+U83ldwkmJAQAB
-com.ibm.websphere.CreationDate=Mon Dec 11 14\:22\:34 EST 2023
diff --git a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/server.xml b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/server.xml
index fa4cbc5fbce..1479f95b839 100755
--- a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/server.xml
+++ b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/server.xml
@@ -23,10 +23,6 @@
 	<application type="war" id="ltpaTest" name="ltpaTest" location="${server.config.dir}/apps/ltpaTest.war"/>
 
 	<include optional="true" location="../fatTestPorts.xml"/>
-    
-    <ltpa monitorInterval = "10" monitorValidationKeysDir="true" expiration="10m" updateTrigger="polled" keysFileName="${server.config.dir}/resources/security/ltpa.keys" keysPassword="{xor}Lz4sLCgwLTs=">
-        <validationKeys fileName="configuredValidation1.keys" password="{xor}Lz4sLCgwLTs=" validUntilDate="2099-01-01T00:00:00Z"/>
-    </ltpa>
 
     <authentication id="Basic" cacheEnabled="false" />
     <javaPermission className="javax.security.auth.AuthPermission" name="createLoginContext.system.WEB_INBOUND"/>
diff --git a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitor.xml b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitor.xml
index 4e3beaeefb6..a1223c8be6f 100755
--- a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitor.xml
+++ b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitor.xml
@@ -23,10 +23,6 @@
 	<application type="war" id="ltpaTest" name="ltpaTest" location="${server.config.dir}/apps/ltpaTest.war"/>
 
 	<include optional="true" location="../fatTestPorts.xml"/>
-    
-    <ltpa monitorInterval = "10" monitorValidationKeysDir="true" expiration="10m" updateTrigger="polled" keysFileName="${server.config.dir}/resources/security/ltpa.keys" keysPassword="{xor}Lz4sLCgwLTs=">
-        <validationKeys fileName="configuredValidation1.keys" password="{xor}Lz4sLCgwLTs=" validUntilDate="2099-01-01T00:00:00Z"/>
-    </ltpa>
 
     <authentication id="Basic" cacheEnabled="false" />
     <javaPermission className="javax.security.auth.AuthPermission" name="createLoginContext.system.WEB_INBOUND"/>
diff --git a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitorAndWrongPassword.xml b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitorAndWrongPassword.xml
index 8b0d5d49ee1..8788881827b 100755
--- a/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitorAndWrongPassword.xml
+++ b/dev/com.ibm.ws.security.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitorAndWrongPassword.xml
@@ -23,10 +23,6 @@
 	<application type="war" id="ltpaTest" name="ltpaTest" location="${server.config.dir}/apps/ltpaTest.war"/>
 
 	<include optional="true" location="../fatTestPorts.xml"/>
-    
-    <ltpa monitorInterval = "10" monitorValidationKeysDir="true" expiration="10m" updateTrigger="polled" keysFileName="${server.config.dir}/resources/security/ltpa.keys" keysPassword="{xor}Lz4sLCgwLTs=">
-        <validationKeys fileName="configuredValidation1.keys" password="{xor}Lz4sLCgwLTs=" validUntilDate="2099-01-01T00:00:00Z"/>
-    </ltpa>
 
     <authentication id="Basic" cacheEnabled="false" />
     <javaPermission className="javax.security.auth.AuthPermission" name="createLoginContext.system.WEB_INBOUND"/>