[java-idp-plugin-oidc-op-oidfed] 02/02: Use test federation anchor and intermediate keys from oidfed-common-testing

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-idp-plugin-oidc-op-oidfed.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-oidc-op-oidfed/commit/dcfa4f3696aa263a978762a4c7049feec5d72721

commit dcfa4f3696aa263a978762a4c7049feec5d72721
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Sep 17 14:26:56 2026 +0300

    Use test federation anchor and intermediate keys from oidfed-common-testing
---
 .../op/profile/flow/oidfed/AbstractFederationFlowTest.java | 14 +++-----------
 .../src/test/resources/credentials/fed-local-anchor.jwk    | 13 -------------
 .../test/resources/credentials/fed-local-intermediate.jwk  | 12 ------------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/AbstractFederationFlowTest.java b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/AbstractFederationFlowTest.java
index c9832ec..68c1a50 100644
--- a/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/AbstractFederationFlowTest.java
+++ b/idp-oidfed-op-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/oidfed/AbstractFederationFlowTest.java
@@ -76,9 +76,9 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
 
 import net.minidev.json.JSONObject;
 import net.shibboleth.idp.plugin.oidc.op.profile.flow.AbstractOidcFlowTest;
-import net.shibboleth.oidc.security.credential.BasicJWKCredential;
 import net.shibboleth.oidfed.messaging.impl.ResolveEntityResponse;
 import net.shibboleth.oidfed.metadata.EntityStatement;
+import net.shibboleth.oidfed.testing.TestFederationCredentials;
 import net.shibboleth.oidfed.testing.TrustChainTestUtil;
 import net.shibboleth.shared.logic.Constraint;
 
@@ -123,20 +123,12 @@ public class AbstractFederationFlowTest extends AbstractOidcFlowTest {
     protected HttpClient vanillaOidcHttpClient;
 
     static {
+        trustedAnchorKey = TestFederationCredentials.trustAnchorKey();
+        trustedIntermediateKey = TestFederationCredentials.intermediateKey();
         try {
             rpKey = initializeNewJwk("RSA", 2048, "mockRpKey");
             leafKey = initializeNewJwk("RSA", 2048, "mockLeafKey");
             anchorKey = initializeNewJwk("RSA", 2048, "mockAnchorKey");
-            final BasicJWKCredential localAnchor = loadCredential("/credentials/fed-local-anchor.jwk");
-            trustedAnchorKey = new RSAKey.Builder((RSAPublicKey) localAnchor.getPublicKey())
-                    .privateKey(localAnchor.getPrivateKey())
-                    .keyID("locallyTrustedAnchorKey")
-                    .build();
-            final BasicJWKCredential localIntermediate = loadCredential("/credentials/fed-local-intermediate.jwk");
-            trustedIntermediateKey = new RSAKey.Builder((RSAPublicKey) localIntermediate.getPublicKey())
-                    .privateKey(localIntermediate.getPrivateKey())
-                    .keyID("locallyTrustedIntermediateKey")
-                    .build();
             intermediateKey = initializeNewJwk("RSA", 2048, "mockIntermediateKey");
             trustMarkIssuerKey = initializeNewJwk("RSA", 2048, "mockTrustMarkIssuerKey");
         } catch (final NoSuchAlgorithmException e) {
diff --git a/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-anchor.jwk b/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-anchor.jwk
deleted file mode 100644
index 8601a78..0000000
--- a/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-anchor.jwk
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "alg": "RS256",
-    "kid": "locallyTrustedAnchorKey",
-    "kty": "RSA",
-    "p": "y_ul6_wF0dnPzfK_BW0q5dM2aKRFOekotB6mFmWXE4VY_EVRpPAcHQppBbOUOBMkg_NSmjRK3x8wZYhLeavqfsFNcpGMAMsL1LA_FtPFo1R2B8n-FpcA9uRimjDxlzIQKrbEYM1OGPA7jLCE57fNzta2YM4e1sjP3W7-TfOa7v0",
-    "q": "x--fmMMzN9CRakq-pi6I0ClQq4PXJnJROGzVSjMGKs-YbaFXaWPnF_rHqJunmFavTiiSwCv36kiseEAA8fTl-Ms75MXp7LGo30e0F7JJ3vXDD5MwvapswwoiWJWCgJxCOnWJdWvm_iZApK9xcaM_ngTWQuQEq1JhPq6rEB4wck0",
-    "d": "AnBEysAXveM6Lkt2U4RaRoq30upD1EwX7GBE0xCEyzXHESoZIhriDICL9DcCnH7wz0GHittysTrnzEcOWA37mMRKtMJ9ZX3P4QXhfcxGPVvJoDXuH3hR1rbXsu-b9-aYsGNeO6fZSafqhXBeXYU3q1CJFFjoe72drw3DJ3xwCRdYv3y94YBw09kAQYOA4zAtxrUF3ZhlLH9K4sfFLAEzztJX-OuY3a2UFeNC1FkpNDKovbXU0yrkP_y5jjSPrjI2lBQg4yFN5hM3YM7bvG001E796CEhqRYsnLazNDpRXAIQc_jbs_3YrdrlaWR-abMj1zr0zw44a8JZ5Tvd7imZaQ",
-    "e": "AQAB",
-    "qi": "OlB4Yfvc6MBNsFUPpFGXmuYjVDkgTtcAEG60n1TDsrh4C2ir0-ZyaQg1gV3D3EabD96lnp7IiO3uX6X6e6AJgC2AW052bc1EuRQkhyyXeEYN23u3elF1y2F4eQUbNgfc2ghZfUqx5xhZDWFXbrMC7NaOCn1UOIfBe2kuvqSL8Es",
-    "dp": "ebkddgjaYDOd8cPdgZt3cdXsLd15AenExFdVvR-6W4fDZibnZYly_VFtAl37IMsriyH0NNjnpOWzt6LxhxWzxRgM40U_SmngEXdq7nBJDAImvNcorMpHZQ08Wc7DG_pf811FKo7Y_8C7iGT9qljgk4FFK9dUR89lWzoUvueTmPE",
-    "dq": "UBHQ8pbJ_kJS2iSQ8XCVbff9zJKCKW2CxXwgdxS0FZUJ0G3a2eQeemX-a7HajpG4py5shvWU1YjBOW84ca3II7kQhXAVXKtRnAnVP-Aw4U-_DI-_51VHNVzroFpP5z2s8Eh-Aj5yRboADXQNlJryMVBylltG222kcDv3Wf8dG8k",
-    "n": "n0-NFV06ZDKLo1v8KrSJsQ8bbLEffVJw1F5jGXqrKh_4PpBt9FmyWY3gIA9aK1p1WneMaWRNlM1EObierCr0EdXCQbgpKorrPqxiwyl6cOMIH4fN_9uWGqD2HlyGcjcESrNjZz75tNr_9oegh6fWSMgrxyySpU38ALWUX1ZuNS8A4tj8XdJSbSHqftf7qOdgzuy0yaD5h7NwoBCRPOIY88vOLHkcQ4nYdkk8GLSIf5GgGb7JFiPuFHN7pK---LNnFBifag2wbEZ9nnAcAol4jc2gF7zq2mqhMSlbIVmTRj4Y9wxh3DPbmC8xZ-8nbhPmgi4vlij9JWJGEvfLuXaMGQ"
-}
\ No newline at end of file
diff --git a/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-intermediate.jwk b/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-intermediate.jwk
deleted file mode 100644
index 7ba5321..0000000
--- a/idp-oidfed-op-impl/src/test/resources/credentials/fed-local-intermediate.jwk
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "p":"vGxtVhQO5fnZ3FRA48ECw8y0Oojketpf0kM8dtTZpao3BYR5xZDJ7tt8ebGCpRfMWmy48PJqIR2-hAAe_i6GnX9mmlIx_fkur0aoMAx-M1kNHY3Dkr_NL6ulBUBj0b-1G_36a4BoLybflhNaFxmL2mznqUgELOPbu5oDyTyCqMk",
-    "kty":"RSA",
-    "q":"xbJas9_2ntoPXuLNX-MUFj6uxmuU1atmHO6VtC6tL7wp3uuHq1QuPiBt6Ik0Emh0ShuES9mrnXrBbc8vVw9Z_HeeGrW6t26tYN10mNXJsO69_nOiN1IL1Sb_sPRsYcxPi02gZAPKxXcqg4IfKY2JGh5Z-_UukGjUlPVENK3eM-s",
-    "d":"JGCJMehmnZScKLpK2IXtRsGGIbSvb0CG5kP8L8w-CN-K6FlbeKRGqHyNY7fojVjnbi-hR5O_TmFvhXmwgJOwGfX550HRU3sMXyi7WhAXzYfoJQivElFqUosWForIETHaU5mhZGpT-emIcxgOpPUw_3zGdUzzGFhxn4IIFEELX0C5JzZqi8fAx-d3UCp7bHJKgh8qF_agkXnbU4aHdHpq9NEuATTY8U9Qos6clGfAK3BlRMnb5I-uFGOyrbjUYnbDVyQi26yUhJ6yQtttFGWam6yDAjpLFJYXpGdcbf4ibGPtl-32b7eDRuQsOqSU_kXBktT_8DlIZ1n-U7BrhrQB",
-    "e":"AQAB",
-    "kid":"locallyTrustedIntermediateKey",
-    "qi":"l1mhiM0lvZMZongGLwv9r-GOzu1_LhYxq3KBXi_BHgoM7DR3aVGyCEOthFQTNnKb2laALaxVyqrTGGl4zaPGani1D7YzvIWOk4610U1V7Tykr86H7geud7PC8stF_XzwDwx9pYu-sMH7EdmTPQQPo3OQdHECEoVHD36Gp609RUo",
-    "dp":"FV-PP3ZjAj9HMTD1c2BPefpcb09b63ud5vHth-U5Ewut1hhi38A-x7Np-Tvjf-qlKZSvndVBqKQBGmQRH_ATIQZ0kwjD1vVPEF7JcTnZjuWJEVMlXh4XnlKwE1pseDxwxM4Ye91C9CZKsnFbhMdHD-3OkWsz3guyvyMHTupoP9E",
-    "dq":"BArNh_gAVucmgU4p3NgLxRirAiuY83V5tQW70d9SczNpt8EhGQOznlmTZbnIcsfn-MvvPI3K0IF-Cvy9fw41TNA1T15_3thIez6L78QPR6rZ_6XlnzPyQf12JOwaezVuOu7vZJwfPUJegCnc8UCPmRUdyeUNeq5qClGpf1o-vNk",
-    "n":"kYK2ScZiF-zm9VnOS0MXMrszjOtEj7_YmyuJzyG3VHZPH5EPR_79MwzXgRUxFQXTHFw93NQbiIL3m6TX6RDCtphPdO7iVTF_aNRqCy3Hdn7Ws8NQbAHyj9WihoN6b-euFc_T-C7hkPYJcoIG9A9X0rcXyE2hlS4n386eWSR-gTHjvoZQ_M63Eoo4FZVx_8213Qmx0Pwypi-iZ1mW745TI1FvuYzZfZk0xGdfxsgJzQLnXPm_hcQJKMcOFPxdqw0xLqKdByp2LKjrqlOIoZKgTOeWvFr_TV21vKC5ijp1Nh4POwkI-urAl6fmELx_Mn_z7ZvwUhefzznnRgL6xt77gw"
-}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.