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, 47 insertions, 28 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index 6638b12..c55e727 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.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;

@@ -42,6 +43,8 @@ import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
  */

 public class DetachedBKUConnector implements Connector, LocalConnector

 {

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

+

   /**

    * The log.

    */

@@ -274,11 +277,11 @@ public class DetachedBKUConnector implements Connector, LocalConnector
    * @throws ConnectorException

    *           f.e.

    */

-  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$

 

     // TODO debug - remove

@@ -316,39 +319,19 @@ public class DetachedBKUConnector implements Connector, LocalConnector
    * @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))

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

     {

-      log.debug("The signature is MOA signed -> getting XML content from DetachedLocRefMOA connector.");

-      DetachedLocRefMOAConnector moa_conn = new DetachedLocRefMOAConnector(this.environment.getProfile(), "loc ref not needed here");

-      xml_content = moa_conn.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("ATrust signature detected");

-     MOASoapWithAttachmentConnector moaConn = new MOASoapWithAttachmentConnector(this.params);

-     moaConn.reInitVerifyTemplate(MOASoapWithAttachmentConnector.ATRUST_VERIFY_TEMPLATE_KEY);

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

-  }

-  // TD

+       xml_content = dsigData.getXmlDsig();

+    }

     else

     {

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

-      xml_content = prepareXMLContent(data, so);

+       xml_content = chooseAndCreateXMLDsig(data, so);

     }

     

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

@@ -358,7 +341,36 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     return verify_request_xml;

   }

 

-  /**

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

+    // MOA

+    if (SigKZIDHelper.isMOASigned(so))

+    {

+      log.debug("The signature is MOA signed -> getting XML content from DetachedLocRefMOA connector.");

+      DetachedLocRefMOAConnector moa_conn = new DetachedLocRefMOAConnector(this.environment.getProfile(), "loc ref not needed here");

+      return moa_conn.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("ATrust signature detected");

+      MOASoapWithAttachmentConnector moaConn = new MOASoapWithAttachmentConnector(this.params);

+      moaConn.reInitVerifyTemplate(MOASoapWithAttachmentConnector.ATRUST_VERIFY_TEMPLATE_KEY);

+      return moaConn.prepareXMLContent(data, so);

+    }

+    // TD

+    else

+    {

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

+      return prepareXMLContent(data, so);

+    }

+  }

+

+/**

    * Prepares the XML content the holds the actual signature data.

    * 

    * <p>

@@ -773,4 +785,11 @@ public class DetachedBKUConnector implements Connector, LocalConnector
       return value;

     }

   }

+

+

+  public XMLDsigData reconstructXMLDsig(SignatureData data, SignSignatureObject so)

+      throws ConnectorException {

+     String xmldsig = chooseAndCreateXMLDsig(data, so);

+     return new XMLDsigData(xmldsig, true);

+  }

 }