Skip to content

Commit 6a6edf6

Browse files
authored
Merge pull request #31974 from tloodu/fips140_3-disableSamlTests
Disable chain certificate tests in SAML SSO bucket when FIPS 140-3 is enabled
2 parents 11cd752 + 0d57e7b commit 6a6edf6

File tree

1 file changed

+10
-0
lines changed
  • dev/com.ibm.ws.security.saml.sso_fat/fat/src/com/ibm/ws/security/saml/fat/common

1 file changed

+10
-0
lines changed

dev/com.ibm.ws.security.saml.sso_fat/fat/src/com/ibm/ws/security/saml/fat/common/BasicSAMLTests.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.List;
1717

1818
import org.junit.Test;
19+
import org.junit.Rule;
1920
import org.junit.runner.RunWith;
2021

2122
import com.gargoylesoftware.htmlunit.HttpMethod;
@@ -35,6 +36,8 @@
3536
import componenttest.rules.repeater.EmptyAction;
3637
import componenttest.rules.repeater.JakartaEE10Action;
3738
import componenttest.rules.repeater.JakartaEE9Action;
39+
import componenttest.rules.SkipJavaSemeruWithFipsEnabled;
40+
import componenttest.rules.SkipJavaSemeruWithFipsEnabled.SkipJavaSemeruWithFipsEnabledRule;
3841
import componenttest.topology.impl.LibertyServerWrapper;
3942

4043
/**
@@ -61,6 +64,9 @@ public class BasicSAMLTests extends SAMLCommonTest {
6164

6265
private static final String MSG_CWWKO0219I_SSL_PORT_READY = "CWWKO0219I:.*ssl.*";
6366

67+
@Rule
68+
public static final SkipJavaSemeruWithFipsEnabled skipJavaSemeruWithFipsEnabled = new SkipJavaSemeruWithFipsEnabled("com.ibm.ws.security.saml.sso-2.0_fat");
69+
6470
// example of updating Partner and Federation
6571
// SAMLTestSettings updatedTestSettings = testSettings.copyTestSettings();
6672
// // replace the hard coded "sp" with "spChris" as the partner name - needs to match
@@ -1021,6 +1027,8 @@ public void basicSAMLTests_chainedCert_noMetaData_leafInKeyStore() throws Except
10211027
*
10221028
* @throws Exception
10231029
*/
1030+
// TODO: Test is disabled from running when FIPS 140-3 is enabled, convert chained certificate to use SHA256withRSA signature algorithm
1031+
@SkipJavaSemeruWithFipsEnabledRule
10241032
@AllowedFFDC(value = { "com.ibm.ws.security.saml.error.SamlException" })
10251033
@Mode(TestMode.LITE)
10261034
@Test
@@ -1066,6 +1074,8 @@ public void basicSAMLTests_chainedCert_noMetaData_intermediateInKeyStore() throw
10661074
*
10671075
* @throws Exception
10681076
*/
1077+
// TODO: Test is disabled from running when FIPS 140-3 is enabled, convert chained certificate to use SHA256withRSA signature algorithm
1078+
@SkipJavaSemeruWithFipsEnabledRule
10691079
@AllowedFFDC(value = { "com.ibm.ws.security.saml.error.SamlException" })
10701080
@Test
10711081
public void basicSAMLTests_chainedCert_noMetaData_rootInKeyStore() throws Exception {

0 commit comments

Comments
 (0)