This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/expired-certs in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit b0d781e264ab8842592a828425fabe28103d9a0c Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Mar 10 09:42:32 2026 +0000 Fixing expired certs --- .../cxf/fediz/core/KeystoreCallbackHandler.java | 4 ++-- .../core/config/FedizConfigurationWriterTest.java | 2 +- plugins/core/src/test/resources/clientstore.jks | Bin 4559 -> 8098 bytes .../src/test/resources/fediz_meta_test_config.xml | 4 ++-- .../test/resources/fediz_meta_test_config_saml.xml | 4 ++-- plugins/core/src/test/resources/fediz_test_config.xml | 2 +- .../src/test/resources/fediz_test_config_saml.xml | 8 ++++---- plugins/core/src/test/resources/stsrealm_a.jks | Bin 2061 -> 2062 bytes plugins/core/src/test/resources/stsrealm_b.jks | Bin 2062 -> 2063 bytes plugins/core/src/test/resources/stsstore.jks | Bin 4557 -> 8108 bytes plugins/core/src/test/resources/ststrust.jks | Bin 5606 -> 6198 bytes .../fediz/service/sts/PasswordCallbackHandler.java | 2 +- services/sts/src/main/resources/ststrust.jks | Bin 4502 -> 6198 bytes .../samlWebapp/src/main/resources/ststrust.jks | Bin 4502 -> 6198 bytes systests/oidc/src/test/resources/alice.cer | Bin 873 -> 1263 bytes systests/tests/src/test/resources/alice_client.jks | Bin 2225 -> 2710 bytes systests/tests/src/test/resources/server.jks | Bin 5186 -> 5186 bytes systests/tomcat/src/test/resources/fediz_config.xml | 1 - systests/websphere/src/test/resources/alice.cer | Bin 873 -> 1263 bytes 19 files changed, 13 insertions(+), 14 deletions(-) diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java index d80fdee1..44ca14d9 100644 --- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java +++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java @@ -38,8 +38,8 @@ public class KeystoreCallbackHandler implements CallbackHandler { private Map<String, String> users = new HashMap<>(); public KeystoreCallbackHandler() { - users.put("mystskey", "stskpass"); - users.put("myclientkey", "ckpass"); + users.put("mystskey", "stsspass"); + users.put("myclientkey", "cspass"); users.put("realma", "realma"); users.put("realmb", "realmb"); } diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java index 5f5be1c1..52810cd1 100644 --- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java +++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java @@ -73,7 +73,7 @@ public class FedizConfigurationWriterTest { private static final String JKS_TYPE = "JKS"; private static final String KEYSTORE_PASSWORD = "storepass"; - private static final String KEY_PASSWORD = "stskpass"; + private static final String KEY_PASSWORD = "stsspass"; private static final String KEY_ALIAS = "mystskey"; private static final String AUDIENCE_URI_1 = "http://host_one:port/url";; diff --git a/plugins/core/src/test/resources/clientstore.jks b/plugins/core/src/test/resources/clientstore.jks index f734f87b..ed9466aa 100644 Binary files a/plugins/core/src/test/resources/clientstore.jks and b/plugins/core/src/test/resources/clientstore.jks differ diff --git a/plugins/core/src/test/resources/fediz_meta_test_config.xml b/plugins/core/src/test/resources/fediz_meta_test_config.xml index 68ee9883..3e034fba 100644 --- a/plugins/core/src/test/resources/fediz_meta_test_config.xml +++ b/plugins/core/src/test/resources/fediz_meta_test_config.xml @@ -31,7 +31,7 @@ <issuer certificateValidation="PeerTrust" /> </trustedIssuers> <maximumClockSkew>1000</maximumClockSkew> - <signingKey keyAlias="mystskey" keyPassword="stskpass"> + <signingKey keyAlias="mystskey" keyPassword="stsspass"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="federationProtocolType" @@ -67,7 +67,7 @@ <issuer certificateValidation="PeerTrust" /> </trustedIssuers> <maximumClockSkew>1000</maximumClockSkew> - <signingKey keyPassword="stskpass"> + <signingKey keyPassword="stsspass"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="federationProtocolType" diff --git a/plugins/core/src/test/resources/fediz_meta_test_config_saml.xml b/plugins/core/src/test/resources/fediz_meta_test_config_saml.xml index b9d346f0..ec5311ed 100644 --- a/plugins/core/src/test/resources/fediz_meta_test_config_saml.xml +++ b/plugins/core/src/test/resources/fediz_meta_test_config_saml.xml @@ -31,7 +31,7 @@ <issuer certificateValidation="PeerTrust" /> </trustedIssuers> <maximumClockSkew>1000</maximumClockSkew> - <signingKey keyAlias="mystskey" keyPassword="stskpass"> + <signingKey keyAlias="mystskey" keyPassword="stsspass"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="samlProtocolType" version="1.2"> @@ -59,7 +59,7 @@ <issuer certificateValidation="PeerTrust" /> </trustedIssuers> <maximumClockSkew>1000</maximumClockSkew> - <signingKey keyPassword="stskpass"> + <signingKey keyPassword="stsspass"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="samlProtocolType" version="1.2"> diff --git a/plugins/core/src/test/resources/fediz_test_config.xml b/plugins/core/src/test/resources/fediz_test_config.xml index 82d1a3a4..31c5564a 100644 --- a/plugins/core/src/test/resources/fediz_test_config.xml +++ b/plugins/core/src/test/resources/fediz_test_config.xml @@ -230,7 +230,7 @@ <trustedIssuers> <issuer certificateValidation="PeerTrust" /> </trustedIssuers> - <tokenDecryptionKey keyPassword="stskpass"> + <tokenDecryptionKey keyPassword="stsspass"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </tokenDecryptionKey> diff --git a/plugins/core/src/test/resources/fediz_test_config_saml.xml b/plugins/core/src/test/resources/fediz_test_config_saml.xml index 37166c5b..4e9570ff 100644 --- a/plugins/core/src/test/resources/fediz_test_config_saml.xml +++ b/plugins/core/src/test/resources/fediz_test_config_saml.xml @@ -195,7 +195,7 @@ type="JKS" /> </trustManager> </certificateStores> - <signingKey keyPassword="stskpass" keyAlias="mystskey"> + <signingKey keyPassword="stsspass" keyAlias="mystskey"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <trustedIssuers> @@ -225,7 +225,7 @@ type="JKS" /> </trustManager> </certificateStores> - <signingKey keyPassword="stskpass" keyAlias="mystskey"> + <signingKey keyPassword="stsspass" keyAlias="mystskey"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </signingKey> <trustedIssuers> @@ -376,7 +376,7 @@ <trustedIssuers> <issuer certificateValidation="PeerTrust" /> </trustedIssuers> - <tokenDecryptionKey keyPassword="stskpass" keyAlias="mystskey"> + <tokenDecryptionKey keyPassword="stsspass" keyAlias="mystskey"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </tokenDecryptionKey> @@ -408,7 +408,7 @@ <trustedIssuers> <issuer certificateValidation="PeerTrust" /> </trustedIssuers> - <tokenDecryptionKey keyPassword="stskpass" keyAlias="mystskey"> + <tokenDecryptionKey keyPassword="stsspass" keyAlias="mystskey"> <keyStore file="stsstore.jks" password="stsspass" type="JKS" /> </tokenDecryptionKey> diff --git a/plugins/core/src/test/resources/stsrealm_a.jks b/plugins/core/src/test/resources/stsrealm_a.jks index fde29282..a20cadf6 100644 Binary files a/plugins/core/src/test/resources/stsrealm_a.jks and b/plugins/core/src/test/resources/stsrealm_a.jks differ diff --git a/plugins/core/src/test/resources/stsrealm_b.jks b/plugins/core/src/test/resources/stsrealm_b.jks index 83fd0452..01118515 100644 Binary files a/plugins/core/src/test/resources/stsrealm_b.jks and b/plugins/core/src/test/resources/stsrealm_b.jks differ diff --git a/plugins/core/src/test/resources/stsstore.jks b/plugins/core/src/test/resources/stsstore.jks index 51f131f2..48d0eb1f 100644 Binary files a/plugins/core/src/test/resources/stsstore.jks and b/plugins/core/src/test/resources/stsstore.jks differ diff --git a/plugins/core/src/test/resources/ststrust.jks b/plugins/core/src/test/resources/ststrust.jks index ad86fe46..a02a0275 100644 Binary files a/plugins/core/src/test/resources/ststrust.jks and b/plugins/core/src/test/resources/ststrust.jks differ diff --git a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java index f3974067..2ceef4ec 100644 --- a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java +++ b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java @@ -40,7 +40,7 @@ public class PasswordCallbackHandler implements CallbackHandler { break; } if ("mystskey".equals(pc.getIdentifier())) { - pc.setPassword("stskpass"); + pc.setPassword("stsspass"); break; } } diff --git a/services/sts/src/main/resources/ststrust.jks b/services/sts/src/main/resources/ststrust.jks index c4cd2af0..a02a0275 100644 Binary files a/services/sts/src/main/resources/ststrust.jks and b/services/sts/src/main/resources/ststrust.jks differ diff --git a/systests/federation/samlWebapp/src/main/resources/ststrust.jks b/systests/federation/samlWebapp/src/main/resources/ststrust.jks index b167b9a1..a02a0275 100644 Binary files a/systests/federation/samlWebapp/src/main/resources/ststrust.jks and b/systests/federation/samlWebapp/src/main/resources/ststrust.jks differ diff --git a/systests/oidc/src/test/resources/alice.cer b/systests/oidc/src/test/resources/alice.cer index 9644a0e4..8a048e03 100644 Binary files a/systests/oidc/src/test/resources/alice.cer and b/systests/oidc/src/test/resources/alice.cer differ diff --git a/systests/tests/src/test/resources/alice_client.jks b/systests/tests/src/test/resources/alice_client.jks index 55805da3..10c23057 100644 Binary files a/systests/tests/src/test/resources/alice_client.jks and b/systests/tests/src/test/resources/alice_client.jks differ diff --git a/systests/tests/src/test/resources/server.jks b/systests/tests/src/test/resources/server.jks index 5dfc5e49..5d020c4d 100644 Binary files a/systests/tests/src/test/resources/server.jks and b/systests/tests/src/test/resources/server.jks differ diff --git a/systests/tomcat/src/test/resources/fediz_config.xml b/systests/tomcat/src/test/resources/fediz_config.xml index f4dca811..5558730b 100644 --- a/systests/tomcat/src/test/resources/fediz_config.xml +++ b/systests/tomcat/src/test/resources/fediz_config.xml @@ -228,4 +228,3 @@ <tokenExpirationValidation>true</tokenExpirationValidation> </contextConfig> </FedizConfig> - diff --git a/systests/websphere/src/test/resources/alice.cer b/systests/websphere/src/test/resources/alice.cer index 9644a0e4..8a048e03 100644 Binary files a/systests/websphere/src/test/resources/alice.cer and b/systests/websphere/src/test/resources/alice.cer differ
