New signature layout for new MOCCA bku integrated (etsi-moc-1.1).

New architecture implemented that allows different signature layouts for single types of BKUs.

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

1 files changed, 26 insertions, 18 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 5164771..100f054 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
@@ -21,10 +21,10 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;
 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.DetachedLocRefMOAConnector;

-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.DetachedMOCIdFormatter;

+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.LocRefDetachedMOCCAConnector;

 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.tools.CodingHelper;

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

 

@@ -125,24 +125,20 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     log.debug("analyzeSignResponse:"); //$NON-NLS-1$

 

     String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);

-    String bkuServerHeader = response_properties.getProperty(BKUPostConnection.BKU_SERVER_HEADER_KEY);

-    String bkuUserAgentHeader = response_properties.getProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY);

 

     BKUHelper.checkResponseForError(response_string);

 

-    // TODO[tknall] Parse server type and version in order to prevent unsupported cces from signing pdfs

-    // http://www.buergerkarte.at/konzept/securitylayer/spezifikation/aktuell/bindings/bindings.html#http.kodierung.response.dataurl

-    log.debug("BKU response header \"user-agent\" header:  " + bkuUserAgentHeader);

-    // http://www.buergerkarte.at/konzept/securitylayer/spezifikation/aktuell/bindings/bindings.html#http.kodierung.response.browser

-    log.debug("BKU response header \"server\"     header:  " + bkuServerHeader);

+    String bkuIdentifier = BKUHelper.getBKUIdentifier(response_properties);

+    log.debug("BKU identifier: \"" + bkuIdentifier + "\"");

     

-    SignSignatureObject so;

-    if (MOCCAHelper.isMOCCACCEId(bkuServerHeader == null ? bkuUserAgentHeader : bkuServerHeader)) {

-       log.debug("Evaluating response as MOCCA response.");

-       so = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());

-    } else {

-       so = BKUHelper.parseCreateXMLResponse(response_string, new DetachedIdFormatter());

+    SignatureLayoutHandler sigLayout;

+    try {

+       sigLayout = SignatureLayoutHandlerFactory.getSignatureLayoutHandlerInstance(bkuIdentifier);

+    } catch (SettingsException e) {

+       throw new ConnectorException(e.getErrorCode(), e.getMessage());

     }

+    

+    SignSignatureObject so = sigLayout.parseCreateXMLSignatureResponse(response_string);

 

     so.response_properties = response_properties;

 

@@ -322,17 +318,29 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     String verify_request_template = this.environment.getVerifyRequestTemplate();

 

     String xml_content = null;

+

+    // 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");

       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);

+  }

+  // TD

     else

     {

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

       xml_content = prepareXMLContent(data, so);

     }

-

+    

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

     verify_request_xml = verify_request_xml.replaceFirst(TemplateReplaces.LOC_REF_CONTENT_REPLACE, this.environment.getLocRefContent());

     verify_request_xml = verify_request_xml.replaceFirst(TemplateReplaces.DATE_TIME_REPLACE, BKUHelper.formDateTimeElement(this.params.getVerificationTime(), "sl"));