[java-idp-plugin-oidc-rp] branch main updated: JOIDCRP-17 - Add JWT Encryption Parameter Resolver Support

[Phil Smart]

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=dd3bf1fe3696e4dc56fc554e0103887a9690ce60

The following commit(s) were added to refs/heads/main by this push:
     new dd3bf1f  JOIDCRP-17 - Add JWT Encryption Parameter Resolver Support
dd3bf1f is described below

commit dd3bf1fe3696e4dc56fc554e0103887a9690ce60
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Aug 15 09:38:33 2022 +0100

    JOIDCRP-17 - Add JWT Encryption Parameter Resolver Support
    
     - Re-enable test to verify ECDH-ES key agreement params are resolved
    
     https://shibboleth.atlassian.net/browse/JOIDCRP-17
---
 .../shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java   |  1 -
 .../idp/plugin/authn/oidc/rp/impl/EncryptJWTTest.java          |  2 +-
 .../impl/ProviderMetadataEncryptionParametersResolverTest.java | 10 +++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
index fc0aeff..0b176a1 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
@@ -48,7 +48,6 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /** 
  * Decrypt the located JWE using the decryption parameters stored in the security context.
- * 
  */
 public class DecryptJWT extends AbstractProfileAction {
     
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/EncryptJWTTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/EncryptJWTTest.java
index 6077b24..2a13fa1 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/EncryptJWTTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/EncryptJWTTest.java
@@ -142,7 +142,7 @@ public class EncryptJWTTest extends AbstractOIDCTest {
     }
     
     @Test(expectedExceptions = MessageHandlerException.class)
-    public void testEncrypWithUnsupportedAlgorithm() throws Exception {
+    public void testEncryptWithUnsupportedAlgorithm() throws Exception {
         
         params.setKeyTransportEncryptionAlgorithm("NotSupported");
         params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM);
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProviderMetadataEncryptionParametersResolverTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProviderMetadataEncryptionParametersResolverTest.java
index b205ae1..b978f5e 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProviderMetadataEncryptionParametersResolverTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProviderMetadataEncryptionParametersResolverTest.java
@@ -271,11 +271,7 @@ public class ProviderMetadataEncryptionParametersResolverTest {
         assertFalse(params.iterator().hasNext());    
     }
     
-    /* 
-     * Can not test ECDH-ES as the net.shibboleth.oidc.jwa.algorithm.descriptors.KeyAgreementECDHES is not
-     * supported by the runtime!
-     */
-    @Test(enabled = false)
+    @Test
     public void testSuccessfulResolution_ForKeyAgreement() throws Exception {
         final CriteriaSet criteria =  buildBasicCriteriaSet();
         config.setKeyTransportEncryptionAlgorithms(List.of(KeyManagementConstants.ALGO_ID_ALG_ECDH_ES));
@@ -289,8 +285,8 @@ public class ProviderMetadataEncryptionParametersResolverTest {
         assertNotNull(param.getKeyTransportEncryptionAlgorithm());  
         assertEquals(param.getDataEncryptionAlgorithm(),EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM);
         assertEquals(param.getKeyTransportEncryptionAlgorithm(),KeyManagementConstants.ALGO_ID_ALG_ECDH_ES);
-        assertNotNull(param.getDataEncryptionCredential());
-        assertNotNull(param.getDataEncryptionCredential().getPublicKey());
+        assertNotNull(param.getKeyTransportEncryptionCredential());
+        assertNotNull(param.getKeyTransportEncryptionCredential().getPublicKey());
     }
     
     @Test

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