fix: chain returned as JWT's

rglauco · Oct 30, 2023 · 10b4033 · 10b4033
1 parent dd516ab
commit 10b4033
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/...java/it/spid/cie/oidc/spring/boot/relying/party/controller/EntityStatementController.java b/...java/it/spid/cie/oidc/spring/boot/relying/party/controller/EntityStatementController.java
@@ -62,8 +62,9 @@ public ResponseEntity<String> resolveEntityStatement(
         response.put("metadata", metadata);
         response.put("trust_chain",trust_chain);
 
+        logger.info("resolve endpoint for {}, {}", sub, anchor);
+
         if ("json".equals(format)) {
-            logger.info("resolve endpoint for {}, {}", sub, anchor);
             return ResponseEntity.ok()
                     .contentType(MediaType.APPLICATION_JSON)
                     .body(response.toString());

diff --git a/starter-kit/src/main/java/it/spid/cie/oidc/config/RelyingPartyOptions.java b/starter-kit/src/main/java/it/spid/cie/oidc/config/RelyingPartyOptions.java
@@ -555,9 +555,9 @@ public void validate() throws OIDCException {
 			acrMap.put(OIDCProfile.CIE.value(), AcrValue.L2.value());
 		}
 
-		if (Validator.isNullOrEmpty(logoutRedirectURL)) {
-			throw new ConfigException("no-logout-redirect-url");
-		}
+//		if (Validator.isNullOrEmpty(logoutRedirectURL)) {
+//			throw new ConfigException("no-logout-redirect-url");
+//		}
 
 		validateRequestedClaims();
 		validateUserKeyClaim();

diff --git a/starter-kit/src/main/java/it/spid/cie/oidc/handler/RelyingPartyHandler.java b/starter-kit/src/main/java/it/spid/cie/oidc/handler/RelyingPartyHandler.java
@@ -595,7 +595,7 @@ else if (Validator.isNullOrEmpty(tcb.getFinalMetadata())) {
 					.setSubject(subject)
 					.setType(metadataType)
 					.setExpiresOn(tcb.getExpiresOn())
-					.setChain(tcb.getChainAsString())
+					.setChain(tcb.getChain())
 					.setPartiesInvolved(tcb.getPartiesInvolvedAsString())
 					.setProcessingStart(LocalDateTime.now())
 					.setActive(true)
@@ -607,7 +607,7 @@ else if (Validator.isNullOrEmpty(tcb.getFinalMetadata())) {
 			else {
 				trustChain = trustChain
 					.setExpiresOn(tcb.getExpiresOn())
-					.setChain(tcb.getChainAsString())
+					.setChain(tcb.getChain())
 					.setPartiesInvolved(tcb.getPartiesInvolvedAsString())
 					.setProcessingStart(LocalDateTime.now())
 					.setActive(true)

diff --git a/starter-kit/src/main/java/it/spid/cie/oidc/model/TrustChainBuilder.java b/starter-kit/src/main/java/it/spid/cie/oidc/model/TrustChainBuilder.java
@@ -56,6 +56,14 @@ public TrustChainBuilder(String subject, String metadataType, JWTHelper jwtHelpe
 		this.subject = subject;
 	}
 
+	public String getChain() {
+		StringJoiner sj =  new StringJoiner(",", "[", "]");
+		for (EntityConfiguration ec : trustPath) {
+			sj.add(ec.getJwt());
+		}
+		return sj.toString();
+	}
+
 	public String getChainAsString() {
 		StringJoiner sj = new StringJoiner(",", "[", "]");
 

diff --git a/starter-kit/src/test/java/it/spid/cie/oidc/model/TestTrustChainBuilder.java b/starter-kit/src/test/java/it/spid/cie/oidc/model/TestTrustChainBuilder.java
@@ -63,6 +63,7 @@ public void testTrustChainBuilderClass() {
 		catched = false;
 
 		try {
+			tcb.getChain();
 			tcb.getChainAsString();
 			tcb.getExpiresOn();
 			tcb.getFinalMetadata();