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, 11 insertions, 12 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 abd2b09..4636e20 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
@@ -115,14 +115,6 @@ public class MOASoapWithAttachmentConnector implements Connector
 

     BKUHelper.checkResponseForError(response_string);

 

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

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

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

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

-    

     SignSignatureObject so = MOAHelper.parseCreateXMLResponse(response_string, new DetachedLocRefMOAIdFormatter());

 

     log.debug("analyzeSignResponse finished."); //$NON-NLS-1$

@@ -189,17 +181,24 @@ public class MOASoapWithAttachmentConnector implements Connector
 

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

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

+       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("Generic signature (not MOA/MOCCA) signature detected.");

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

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

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

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

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

     }

 

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