Changes for xmldsig reconstruction

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@612 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 48 insertions, 29 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
index f72cbc2..1d310cf 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
@@ -11,6 +11,7 @@ import org.apache.commons.logging.LogFactory;
 

 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteObject;

 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteUtil;

+import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;

 import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.gv.egiz.pdfas.framework.ConnectorParameters;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

@@ -37,6 +38,7 @@ import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
  */

 public class MOASoapWithAttachmentConnector implements Connector

 {

+ //23.11.2010 changed by exthex - added reconstructXMLDsig method and moved xmldsig creation to chooseAndCreateXMLDsig method

   public static final String ATRUST_VERIFY_TEMPLATE_KEY = "atrust.verify.template.detached";

 

 /**

@@ -151,11 +153,11 @@ public class MOASoapWithAttachmentConnector implements Connector
    * @see at.knowcenter.wag.egov.egiz.sig.connectors.Connector#doVerify(at.knowcenter.wag.egov.egiz.sig.SignatureData,

    *      at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject)

    */

-  public SignatureResponse doVerify(SignatureData data, SignSignatureObject so) throws ConnectorException

+  public SignatureResponse doVerify(SignatureData data, SignSignatureObject so, XMLDsigData dsig) throws ConnectorException

   {

     log.debug("doVerify:"); //$NON-NLS-1$

 

-    String verify_request_xml = prepareVerifyRequest(data, so);

+    String verify_request_xml = prepareVerifyRequest(data, so, dsig);

     log.debug("verify_request_xml = " + verify_request_xml); //$NON-NLS-1$

 

     String url = this.environment.getVerifyURL();

@@ -179,36 +181,18 @@ public class MOASoapWithAttachmentConnector implements Connector
    * @throws ConnectorException

    *           f.e.

    */

-  public String prepareVerifyRequest(SignatureData data, SignSignatureObject so) throws ConnectorException

+  public String prepareVerifyRequest(SignatureData data, SignSignatureObject so, XMLDsigData dsigData) throws ConnectorException

   {

     String verify_request_template = this.environment.getVerifyRequestTemplate();

 

     String xml_content = null;

-    

-    // MOA

-    if (SigKZIDHelper.isMOASigned(so)) {

-       log.debug("MOA signature detected.");

-       xml_content = prepareXMLContent(data, so);

-       

-    // MOCCA

-    } else if (SigKZIDHelper.isMOCCASigned(so)) {

-       log.debug("MOCCA signature detected.");

-       String algorithmId = SigKZIDHelper.parseAlgorithmId(so.id);

-       log.debug("Algorithm = " + algorithmId);

-       LocRefDetachedMOCCAConnector mocca_connector = new LocRefDetachedMOCCAConnector(this.params, "not needed here", algorithmId);

-       xml_content = mocca_connector.prepareXMLContent(data, so);

-

-    // ATrust

-    } else if (SigKZIDHelper.isATrustSigned(so)) {

-       log.debug("A-Trust signature detected.");

-       this.environment.reInitVerifyTemplate(ATRUST_VERIFY_TEMPLATE_KEY);

-       xml_content = prepareXMLContent(data, so);

-       

-    // TD

-    } else {

-       log.debug("TD signature signature detected.");

-       DetachedBKUConnector bku_connector = new DetachedBKUConnector(this.params, "not needed here");

-       xml_content = bku_connector.prepareXMLContent(data, so);

+    if (dsigData != null && dsigData.getXmlDsig() != null)

+    {

+       xml_content = dsigData.getXmlDsig();

+    }

+    else

+    {

+       xml_content = chooseAndCreateXMLDsig(data, so);

     }

 

     String verify_request_xml = verify_request_template.replaceFirst(TemplateReplaces.XML_CONTENT_REPLACE, xml_content);

@@ -230,7 +214,36 @@ public class MOASoapWithAttachmentConnector implements Connector
     return verify_request_xml;

   }

   

-  /**

+  private String chooseAndCreateXMLDsig(SignatureData data, SignSignatureObject so) throws ConnectorException {

+     

+     // MOA

+     if (SigKZIDHelper.isMOASigned(so)) {

+        log.debug("MOA signature detected.");

+        return prepareXMLContent(data, so);

+        

+     // MOCCA

+     } else if (SigKZIDHelper.isMOCCASigned(so)) {

+        log.debug("MOCCA signature detected.");

+        String algorithmId = SigKZIDHelper.parseAlgorithmId(so.id);

+        log.debug("Algorithm = " + algorithmId);

+        LocRefDetachedMOCCAConnector mocca_connector = new LocRefDetachedMOCCAConnector(this.params, "not needed here", algorithmId);

+        return mocca_connector.prepareXMLContent(data, so);

+

+     // ATrust

+     } else if (SigKZIDHelper.isATrustSigned(so)) {

+        log.debug("A-Trust signature detected.");

+        this.environment.reInitVerifyTemplate(ATRUST_VERIFY_TEMPLATE_KEY);

+        return prepareXMLContent(data, so);

+        

+     // TD

+     } else {

+        log.debug("TD signature signature detected.");

+        DetachedBKUConnector bku_connector = new DetachedBKUConnector(this.params, "not needed here");

+        return bku_connector.prepareXMLContent(data, so);

+     }

+  }

+

+/**

    * Analyzes the verify response string.

    * 

    * @param response_properties

@@ -699,4 +712,10 @@ public class MOASoapWithAttachmentConnector implements Connector
 

   }

 

+  public XMLDsigData reconstructXMLDsig(SignatureData data, SignSignatureObject so)

+      throws ConnectorException {

+     String xmldsig = chooseAndCreateXMLDsig(data, so);

+     return new XMLDsigData(xmldsig, true);

+  }

+

 }