extended validation result

1 files changed, 22 insertions, 7 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
index 5d7b852..c3ebda4 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
@@ -37,6 +37,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.ws.soap.AddressingFeature.Responses;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -45,6 +47,7 @@ import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
+import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
 import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
 import at.gv.egovernment.moa.spss.api.impl.AdESFormResultsImpl;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
@@ -235,14 +238,11 @@ public class XMLSignatureVerificationInvoker {
 			throw moaException;
 		}
 
+		ExtendedCertificateCheckResult extCheckResult;
 		if(result != null) {
-			List adesResults = null;//getAdESResult(result.getFormVerificationResult());
+			List adesResults = null;//
 			
-			try {
-				adesResults = getAdESResult(result);
-			} catch (ConfigurationException e) {
-				Logger.warn("Failed to provide extended validation results", e);
-			}
+			adesResults = AdESResultUtils.getAdESResult(result.getFormVerificationResult());
 
 			if (adesResults != null) {
 				Iterator adesIterator = adesResults.iterator();
@@ -252,6 +252,19 @@ public class XMLSignatureVerificationInvoker {
 			}
 
 			responseBuilder.setAdESFormResults(adesResults);
+			
+			try {
+				//Logger.info("Extended Validation Report: " + result.getName());
+				Logger.info("Extended Validation Code: " + result.getResultCode().toString());
+				Logger.info("Extended Validation Info: " + result.getInfo());
+				
+				extCheckResult = AdESResultUtils.getExtendedResult(result.getResultCode());
+				responseBuilder.setExtendedCertificateCheckResult(extCheckResult);
+			} catch (ConfigurationException e) {
+				Logger.warn("Cannot generate Extendend Result. Check SVA Configuration!", e);
+			} catch (NullPointerException e) {
+				Logger.info("No extendend validation result available.");
+			}
 		}
 		// QC/SSCD check
 		List list = plainResult.getCertificateValidationResult().getCertificateChain();
@@ -313,11 +326,13 @@ public class XMLSignatureVerificationInvoker {
 	 *             <code>trustProfile</code> cannot be read from the file
 	 *             system.
 	 */
-	private CheckResult validateSignerCertificate(XMLSignatureVerificationResult result, TrustProfile trustProfile)
+	private CheckResult validateSignerCertificate(XMLSignatureVerificationResult result, 
+			TrustProfile trustProfile)
 			throws MOAException {
 		MessageProvider msg = MessageProvider.getInstance();
 
 		int resultCode = result.getCertificateValidationResult().getValidationResultCode().intValue();
+		
 		if (resultCode == 0 && trustProfile.getSignerCertsUri() != null) {
 			X509Certificate signerCertificate = (X509Certificate) result.getCertificateValidationResult()
 					.getCertificateChain().get(0);