fix: revocation signed with Core key

italia · Oct 10, 2024 · 12d3bc4 · 12d3bc4
1 parent 0f818fc
commit 12d3bc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/starter-kit/src/main/java/it/spid/cie/oidc/helper/OAuth2Helper.java b/starter-kit/src/main/java/it/spid/cie/oidc/helper/OAuth2Helper.java
@@ -154,7 +154,7 @@ public void sendRevocationRequest(
 				.put("exp", JWTHelper.getExpiresOn())
 				.put("jti", UUID.randomUUID().toString());
 
-			JWKSet jwkSet = JWTHelper.getJWKSetFromJSON(clientConf.getJwksFed());
+			JWKSet jwkSet = JWTHelper.getJWKSetFromJSON(clientConf.getJwksCoreByUse(KeyUse.SIGNATURE));
 
 			String clientAssertion = jwtHelper.createJWS(payload, jwkSet);
 

diff --git a/starter-kit/src/test/java/it/spid/cie/oidc/helper/TestOAuth2Helper.java b/starter-kit/src/test/java/it/spid/cie/oidc/helper/TestOAuth2Helper.java
@@ -323,12 +323,13 @@ public void testClass3() {
 					WireMock.forbidden()
 				));
 
-			JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
+			//JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
+			JWKSet jwks = RPTestUtils.getJwksCoreByUse(JWTHelper.getJWKSetFromJSON(options.getJwkCore()), KeyUse.SIGNATURE);
 
 			FederationEntity clientConf = new FederationEntity();
 
 			clientConf.setSubject(RELYING_PARTY);
-			clientConf.setJwksFed(jwks.toString(false));
+			clientConf.setJwksCore(jwks.toString(false));
 
 			helper.sendRevocationRequest(null, null, SPID_PROVIDER + "test", clientConf);
 		}
@@ -352,12 +353,13 @@ public void testClass3() {
 					WireMock.ok()
 				));
 
-			JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
+			//JWKSet jwks = JWTHelper.getJWKSetFromJWK(options.getJwkFed());
+			JWKSet jwks = RPTestUtils.getJwksCoreByUse(JWTHelper.getJWKSetFromJSON(options.getJwkCore()), KeyUse.SIGNATURE);
 
 			FederationEntity clientConf = new FederationEntity();
 
 			clientConf.setSubject(RELYING_PARTY);
-			clientConf.setJwksFed(jwks.toString(false));
+			clientConf.setJwksCore(jwks.toString(false));
 
 			helper.sendRevocationRequest(null, null, SPID_PROVIDER + "test", clientConf);
 		}