PDF-AS integration, AdES Form validation results from IAIK-MOA, for XAdES

8 files changed, 252 insertions, 130 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
index 4c57b13..b725422 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
@@ -797,7 +797,8 @@ public abstract class SPSSFactory {
     ReferencesCheckResult signatureCheck,
     ReferencesCheckResult signatureManifestCheck,
     List xmlDsigManifestChecks,
-    CheckResult certificateCheck);
+    CheckResult certificateCheck,
+    List adesFormResults);
 
   /**
    * Create a new <code>ReferencesCheckResult</code> object.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/AdESFormResultsImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/AdESFormResultsImpl.java
new file mode 100644
index 0000000..c186c54
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/AdESFormResultsImpl.java
@@ -0,0 +1,42 @@
+package at.gv.egovernment.moa.spss.api.impl;
+
+import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
+
+public class AdESFormResultsImpl implements AdESFormResults {
+
+	private Integer code;
+	private String info;
+	private String name;
+	
+	public synchronized void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public synchronized void setInfo(String info) {
+		this.info = info;
+	}
+
+	public synchronized void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public Integer getCode() {
+		return this.code;
+	}
+
+	@Override
+	public String getInfo() {
+		return this.info;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public String toString() {
+		return "AdESFormResultsImpl [code=" + code + ", info=" + info + ", name=" + name + "]";
+	}
+}
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index ac3d4c9..8a46219 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
@@ -453,7 +453,8 @@ public class SPSSFactoryImpl extends SPSSFactory {
     ReferencesCheckResult signatureCheck,
     ReferencesCheckResult signatureManifestCheck,
     List xmlDsigManifestChecks,
-    CheckResult certificateCheck) {
+    CheckResult certificateCheck,
+    List adesFormResults) {
     VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse =
       new VerifyXMLSignatureResponseImpl();
     verifyXMLSignatureResponse.setSignerInfo(signerInfo);
@@ -464,7 +465,7 @@ public class SPSSFactoryImpl extends SPSSFactory {
       signatureManifestCheck);
     verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks);
     verifyXMLSignatureResponse.setCertificateCheck(certificateCheck);
-    
+    verifyXMLSignatureResponse.setAdESFormResults(adesFormResults);
     return verifyXMLSignatureResponse;
   }
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
index 46fd517..bfee774 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.impl;
 
 import java.util.ArrayList;
@@ -37,130 +36,145 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
  * @author Fatemeh Philippi
  * @version $Id$
  */
-public class VerifyXMLSignatureResponseImpl
-  implements VerifyXMLSignatureResponse {
-
-  /** Information about the signer certificate. */
-  private SignerInfo signerInfo;
-  
-  /** 
-   * The hash input data objects. The list consists of {@link at.gv.egovernment.moa.spss.api.common.InputData}s.
-   * */
-  private List hashInputDatas = new ArrayList();
-  
-  /** 
-   * The reference input data objects. The list consists of {@link at.gv.egovernment.moa.spss.api.common.InputData}s. 
-   * */
-  private List referenceInputDatas = new ArrayList();
-  
-  /** Information about the signature check. */
-  private ReferencesCheckResult signatureCheck;
-  /** Information about the signature manifest check. */
-  private ReferencesCheckResult signatureManifestCheck;
-  /** Information about the XMLDsig manifest check. */
-  private List xmlDsigManifestChecks = new ArrayList();
-  /** Information about the certificate check. */
-  private CheckResult certificateCheck;
-  
-  /**
-   * Sets information about the signer certificate.
-   * 
-   * @param signerInfo Information about the signer certificate.
-   */
-  public void setSignerInfo(SignerInfo signerInfo) {
-    this.signerInfo = signerInfo;
-  }
-
-  public SignerInfo getSignerInfo() {
-    return signerInfo;
-  }
-
-  /**
-   * Sets data signed by the signatory.
-   * 
-   * @param hashInputDatas The signed datas.
-   */
-  public void setHashInputDatas(List hashInputDatas) {
-    this.hashInputDatas =
-      hashInputDatas != null
-        ? Collections.unmodifiableList(new ArrayList(hashInputDatas))
-        : null;
-  }
-
-  public List getHashInputDatas() {
-    return hashInputDatas;
-  }
-
-  /**
-   * Sets the source data elements.
-   * 
-   * @param referenceInputDatas The source data elements.
-   */
-  public void setReferenceInputDatas(List referenceInputDatas) {
-    this.referenceInputDatas =
-      referenceInputDatas != null
-        ? Collections.unmodifiableList(new ArrayList(referenceInputDatas))
-        : null;
-  }
-
-  public List getReferenceInputDatas() {
-    return referenceInputDatas;
-  }
-
-  /**
-   * Sets the result of the signature verification.
-   * 
-   * @param signatureCheck The result of the signature verification.
-   */
-  public void setSignatureCheck(ReferencesCheckResult signatureCheck) {
-    this.signatureCheck = signatureCheck;
-  }
-
-  public ReferencesCheckResult getSignatureCheck() {
-    return signatureCheck;
-  }
-
-  /**
-   * Sets the result of the signature manifest verification.
-   * 
-   * @param signatureManifestCheck The result of the signature manifest verification.
-   */
-  public void setSignatureManifestCheck(ReferencesCheckResult signatureManifestCheck) {
-    this.signatureManifestCheck = signatureManifestCheck;
-  }
-
-  public ReferencesCheckResult getSignatureManifestCheck() {
-    return signatureManifestCheck;
-  }
-
-  /**
-   * Sets the result of the certification verification.
-   * 
-   * @param certificateCheck The result of the certificate verification.
-   */
-  public void setCertificateCheck(CheckResult certificateCheck) {
-    this.certificateCheck = certificateCheck;
-  }
-
-  public CheckResult getCertificateCheck() {
-    return certificateCheck;
-  }
-  
-
-  /**
-   * Sets the XMLDSigManifestChecks.
-   * 
-   * @param xmlDsigManifestChecks The XMLDSigManifestChecks.
-   */
-  public void setXMLDsigManifestChecks(List xmlDsigManifestChecks) {
-    this.xmlDsigManifestChecks =
-      xmlDsigManifestChecks != null
-        ? Collections.unmodifiableList(new ArrayList(xmlDsigManifestChecks))
-        : null;
-  }
-
-  public List getXMLDsigManifestChecks() {
-    return xmlDsigManifestChecks;
-  }
+public class VerifyXMLSignatureResponseImpl implements VerifyXMLSignatureResponse {
+
+	/** Information about the signer certificate. */
+	private SignerInfo signerInfo;
+
+	/**
+	 * The hash input data objects. The list consists of
+	 * {@link at.gv.egovernment.moa.spss.api.common.InputData}s.
+	 */
+	private List hashInputDatas = new ArrayList();
+
+	/**
+	 * The reference input data objects. The list consists of
+	 * {@link at.gv.egovernment.moa.spss.api.common.InputData}s.
+	 */
+	private List referenceInputDatas = new ArrayList();
+
+	/**
+	 * The list of form validation results
+	 */
+	private List adesFormResults = new ArrayList();
+
+	/** Information about the signature check. */
+	private ReferencesCheckResult signatureCheck;
+	/** Information about the signature manifest check. */
+	private ReferencesCheckResult signatureManifestCheck;
+	/** Information about the XMLDsig manifest check. */
+	private List xmlDsigManifestChecks = new ArrayList();
+	/** Information about the certificate check. */
+	private CheckResult certificateCheck;
+
+	/**
+	 * Sets information about the signer certificate.
+	 * 
+	 * @param signerInfo
+	 *            Information about the signer certificate.
+	 */
+	public void setSignerInfo(SignerInfo signerInfo) {
+		this.signerInfo = signerInfo;
+	}
+
+	public SignerInfo getSignerInfo() {
+		return signerInfo;
+	}
+
+	/**
+	 * Sets data signed by the signatory.
+	 * 
+	 * @param hashInputDatas
+	 *            The signed datas.
+	 */
+	public void setHashInputDatas(List hashInputDatas) {
+		this.hashInputDatas = hashInputDatas != null ? Collections.unmodifiableList(new ArrayList(hashInputDatas))
+				: null;
+	}
+
+	public List getHashInputDatas() {
+		return hashInputDatas;
+	}
+
+	/**
+	 * Sets the source data elements.
+	 * 
+	 * @param referenceInputDatas
+	 *            The source data elements.
+	 */
+	public void setReferenceInputDatas(List referenceInputDatas) {
+		this.referenceInputDatas = referenceInputDatas != null
+				? Collections.unmodifiableList(new ArrayList(referenceInputDatas)) : null;
+	}
+
+	public List getReferenceInputDatas() {
+		return referenceInputDatas;
+	}
+
+	/**
+	 * Sets the result of the signature verification.
+	 * 
+	 * @param signatureCheck
+	 *            The result of the signature verification.
+	 */
+	public void setSignatureCheck(ReferencesCheckResult signatureCheck) {
+		this.signatureCheck = signatureCheck;
+	}
+
+	public ReferencesCheckResult getSignatureCheck() {
+		return signatureCheck;
+	}
+
+	/**
+	 * Sets the result of the signature manifest verification.
+	 * 
+	 * @param signatureManifestCheck
+	 *            The result of the signature manifest verification.
+	 */
+	public void setSignatureManifestCheck(ReferencesCheckResult signatureManifestCheck) {
+		this.signatureManifestCheck = signatureManifestCheck;
+	}
+
+	public ReferencesCheckResult getSignatureManifestCheck() {
+		return signatureManifestCheck;
+	}
+
+	/**
+	 * Sets the result of the certification verification.
+	 * 
+	 * @param certificateCheck
+	 *            The result of the certificate verification.
+	 */
+	public void setCertificateCheck(CheckResult certificateCheck) {
+		this.certificateCheck = certificateCheck;
+	}
+
+	public CheckResult getCertificateCheck() {
+		return certificateCheck;
+	}
+
+	/**
+	 * Sets the XMLDSigManifestChecks.
+	 * 
+	 * @param xmlDsigManifestChecks
+	 *            The XMLDSigManifestChecks.
+	 */
+	public void setXMLDsigManifestChecks(List xmlDsigManifestChecks) {
+		this.xmlDsigManifestChecks = xmlDsigManifestChecks != null
+				? Collections.unmodifiableList(new ArrayList(xmlDsigManifestChecks)) : null;
+	}
+
+	public List getXMLDsigManifestChecks() {
+		return xmlDsigManifestChecks;
+	}
+
+	public void setAdESFormResults(List adesFormResults) {
+		this.adesFormResults = adesFormResults;
+	}
+	
+	@Override
+	public List getAdESFormResults() {
+		return this.adesFormResults;
+	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
index b5ec20f..eaafe00 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
@@ -286,4 +286,37 @@ public class ResponseBuilderUtils {
     root.appendChild(codeInfoElem);
   }
 
+  /**
+   * Add an element containing <code>Code</code> and <code>Info</code>
+   * subelements.
+   * 
+   * @param response The response document, in order to create new elements in
+   * it.
+   * @param root The root element into which to insert the newly created
+   * element.
+   * @param elementName The name of the newly created element.
+   * @param code The content of the <code>Code</code> subelement.
+   * @param info The content of the <code>Info</code> subelement.
+   */
+  public static void addFormCheckElement(
+    Document response,
+    Element root,
+    String elementName,
+    int code,
+    String name) {
+
+    Element codeInfoElem = response.createElementNS(MOA_NS_URI, elementName);
+    Element codeElem = response.createElementNS(MOA_NS_URI, "Code");
+    Element infoElem;
+    
+    codeElem.appendChild(response.createTextNode(Integer.toString(code)));
+    codeInfoElem.appendChild(codeElem);
+    
+    infoElem = response.createElementNS(MOA_NS_URI, "Name");
+    infoElem.appendChild(response.createTextNode(name));
+    codeInfoElem.appendChild(infoElem);
+    
+    root.appendChild(codeInfoElem);
+  }
+  
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
index dd4e13a..27a42c8 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
@@ -42,6 +42,7 @@ import at.gv.egovernment.moa.spss.api.common.Content;
 import at.gv.egovernment.moa.spss.api.common.ContentBinary;
 import at.gv.egovernment.moa.spss.api.common.ContentXML;
 import at.gv.egovernment.moa.spss.api.common.InputData;
+import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
 import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
@@ -150,6 +151,22 @@ public class VerifyXMLSignatureResponseBuilder {
       response.getCertificateCheck().getInfo());
     
     
+    if(response.getAdESFormResults() != null) {
+    	
+    	Iterator formIterator = response.getAdESFormResults().iterator();
+    	
+    	while(formIterator.hasNext()) {
+    		AdESFormResults adESFormResult = (AdESFormResults)formIterator.next();
+    	// add the CertificateCheck
+        ResponseBuilderUtils.addFormCheckElement(
+          responseDoc,
+          responseElem,
+          "FormCheckResult",
+          adESFormResult.getCode().intValue(),
+          adESFormResult.getName());
+    	
+    	}
+    }
 
     return responseDoc;
   }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/AdESFormResults.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/AdESFormResults.java
new file mode 100644
index 0000000..e12c39b
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/AdESFormResults.java
@@ -0,0 +1,7 @@
+package at.gv.egovernment.moa.spss.api.xmlverify;
+
+public interface AdESFormResults {
+	public Integer getCode();
+	public String getInfo();
+	public String getName();
+}
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
index d107dc9..63c496a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
@@ -81,7 +81,14 @@ public interface VerifyXMLSignatureResponse {
    */
   public CheckResult getCertificateCheck();
   
-  
+  /**
+   * Gets AdES Form results
+   * 
+   * This might be null!
+   * 
+   * @return The result of the AdES Form validation
+   */
+  public List getAdESFormResults();
   
 
 }