remove duplicate ltpa config in nonFIPS case

OpenLiberty · Jan 11, 2025 · 7b9dbeb · 7b9dbeb
1 parent 58df82d
commit 7b9dbeb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 22 deletions.
diff --git a/...urity.token.ltpa_fat/fat/src/com/ibm/ws/security/token/ltpa/fat/LTPAKeyRotationTests.java b/...urity.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
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
@@ -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
@@ -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/...rity.token.ltpa_fat/publish/files/alternate/serverWithLTPAFileMonitorAndWrongPassword.xml b/...rity.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"/>