[java-idp-plugin-oidc-rp] branch main updated: JCOMOIDC-60 - JWT class naming convention

Phil Smart philip.smart at jisc.ac.uk
Wed Jan 11 10:03:18 UTC 2023


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

philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=2639a5f12d76def4788b9ebf676f601c48ea878c

The following commit(s) were added to refs/heads/main by this push:
     new 2639a5f  JCOMOIDC-60 - JWT class naming convention
2639a5f is described below

commit 2639a5f12d76def4788b9ebf676f601c48ea878c
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 10:03:16 2023 +0000

    JCOMOIDC-60 - JWT class naming convention
    
     - Update RP to work with latest commons name chamges
    
    https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
 .../net/shibboleth/idp/service/relying-party/postconfig.xml    |  4 ++--
 .../idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java          | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index d9300fd..c788373 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -93,7 +93,7 @@
         
      <!--  Configuration for publishing key set. -->
     <bean id="shibboleth.authn.oidc.rp.PublishKeySetSecurityConfiguration"
-        class="net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration">
+        class="net.shibboleth.oidc.profile.config.JSONSecurityConfiguration">
        <property name="jwtSignatureSigningConfiguration">
             <ref bean="shibboleth.authn.oidc.rp.PublishKeySetSigningConfiguration" />
         </property>
@@ -120,7 +120,7 @@
      
 
     <bean id="shibboleth.authn.oidc.rp.DefaultSecurityConfiguration"
-        class="net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration">
+        class="net.shibboleth.oidc.profile.config.JSONSecurityConfiguration">
         <property name="jwtDecryptionConfiguration">
             <ref
                 bean="#{'%{idp.authn.oidc.rp.idtoken.decrypt.config:shibboleth.authn.oidc.rp.DefaultJWTDecryptionConfiguration}'.trim()}" />
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
index bcd4815..c990994 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
@@ -82,8 +82,8 @@ import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
 import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
 import net.shibboleth.oidc.authn.principal.AuthenticationContextClassReferencePrincipal;
 import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
+import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
 import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
 import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
 import net.shibboleth.oidc.security.credential.BasicJWKCredential;
 import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
@@ -412,9 +412,9 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
 
      * @return the basic security configuration.
      */
-    private OIDCSecurityConfiguration createBasicSecurityConfigAndValidationParams() {
+    private JSONSecurityConfiguration createBasicSecurityConfigAndValidationParams() {
 
-        final var securityConfig = new OIDCSecurityConfiguration();
+        final var securityConfig = new JSONSecurityConfiguration();
         
         final var sigValConfig = new BasicJWTSignatureValidationConfiguration();
         sigValConfig.setSignatureTrustEngine(
@@ -875,7 +875,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
         partyConfig.setClientCredential(
                 TestCredentialHelper.createDirectEncryptionCredentialFromSharedSecret(CLIENT_SECRET));
         // Set a default security config for the profile config
-        final OIDCSecurityConfiguration secConfig = new OIDCSecurityConfiguration();
+        final JSONSecurityConfiguration secConfig = new JSONSecurityConfiguration();
         
         final var idTokenDecryptConfig = new BasicJWTDecryptionConfiguration();        
         idTokenDecryptConfig.setContentEncryptionKeyCredentialResolver(new CriterionCredentialResolver());
@@ -994,7 +994,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
                     .getSubcontext(RelyingPartyContext.class)
                     .getProfileConfig();        
       
-        final OIDCSecurityConfiguration secConfig = new OIDCSecurityConfiguration();
+        final JSONSecurityConfiguration secConfig = new JSONSecurityConfiguration();
         
         final BasicJWTSignatureValidationConfiguration sigValidation = 
                 new BasicJWTSignatureValidationConfiguration();

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


More information about the commits mailing list