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, 31 insertions, 20 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
index 8107d67..08f0199 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
@@ -10,9 +10,9 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;

 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;

@@ -26,17 +26,9 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorEnvironment;
 import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;

 import at.knowcenter.wag.egov.egiz.sig.connectors.moa.EnvelopingBase64MOAConnector;

-import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.MOCCAHelper;

-import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedIdFormatter;

-import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedLocRefMOAIdFormatter;

-import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;

 import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;

 import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;

-import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandler;

-import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandlerFactory;

-import at.knowcenter.wag.egov.egiz.sig.signaturelayout.mocca.MOCCASignatureLayout10Handler;

 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;

-import at.knowcenter.wag.egov.egiz.tools.FileHelper;

 

 /**

  * @author wprinz

@@ -44,6 +36,7 @@ import at.knowcenter.wag.egov.egiz.tools.FileHelper;
  */

 public class EnvelopedBase64BKUConnector implements Connector, LocalConnector

 {

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

 

   /**

    * The log.

@@ -105,11 +98,11 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
    * @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);

 //    DebugHelper.debugStringToFile(verify_request_xml, "BKU_EnvB64_verify_request.xml"); //$NON-NLS-1$

 

     String url = this.environment.getVerifyURL();

@@ -298,22 +291,18 @@ public class EnvelopedBase64BKUConnector 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;

-    if (SigKZIDHelper.isMOASigned(so))

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

     {

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

-      ConnectorParameters cp = new ConnectorParameters();

-      cp.setProfileId(this.environment.getProfile());

-      EnvelopingBase64MOAConnector moa_conn = new EnvelopingBase64MOAConnector(cp);

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

+       xml_content = dsigData.getXmlDsig();

     }

     else

     {

-      xml_content = prepareXMLContent(data, so);

+       xml_content = chooseAndCreateXMLDsig(data, so);

     }

 

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

@@ -323,7 +312,22 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
     return verify_request_xml;

   }

 

-  /**

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

+     if (SigKZIDHelper.isMOASigned(so))

+     {

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

+       ConnectorParameters cp = new ConnectorParameters();

+       cp.setProfileId(this.environment.getProfile());

+       EnvelopingBase64MOAConnector moa_conn = new EnvelopingBase64MOAConnector(cp);

+       return moa_conn.prepareXMLContent(data, so);

+     }

+     else

+     {

+       return prepareXMLContent(data, so);

+     }

+  }

+

+/**

    * Sends the request to the given URL.

    * 

    * @param url

@@ -632,4 +636,11 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
       return value;

     }

   }

+

+

+  public XMLDsigData reconstructXMLDsig(SignatureData data, SignSignatureObject so)

+      throws ConnectorException {

+     String xmldsig = chooseAndCreateXMLDsig(data, so);

+     return new XMLDsigData(xmldsig, false);

+  }

 }