1 files changed, 43 insertions, 18 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
index c44f34b..b27edde 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
@@ -12,6 +12,7 @@ import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.gv.egiz.pdfas.framework.ConnectorParameters;
 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
+import at.knowcenter.wag.egov.egiz.exceptions.SettingNotFoundException;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
 import at.knowcenter.wag.egov.egiz.sig.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;
@@ -22,6 +23,9 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUHelper;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUPostConnection;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
 import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;
+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;
 
@@ -50,8 +54,19 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
     * @throws ConnectorException Thrown in case of error.
     */
    public LocRefDetachedMOCCAConnector(ConnectorParameters connectorParameters, String loc_ref_content) throws ConnectorException {
+      this(connectorParameters, loc_ref_content, null);
+   }
+
+   /**
+    * Constructor that builds the configuration environment for this connector according to the
+    * given profile.
+    * @param connectorParameters The connectot parameters.
+    * @param algorithmId The algorithm idenifier.
+    * @throws ConnectorException Thrown in case of error.
+    */
+   public LocRefDetachedMOCCAConnector(ConnectorParameters connectorParameters, String loc_ref_content, String algorithmId) throws ConnectorException {
       this.params = connectorParameters;
-      this.environment = new Environment(this.params.getProfileId(), loc_ref_content);
+      this.environment = new Environment(this.params.getProfileId(), loc_ref_content, algorithmId);
    }
 
    /**
@@ -116,15 +131,17 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
       String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);
       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 = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());
+      String bkuIdentifier = BKUHelper.getBKUIdentifier(response_properties);
+      log.debug("BKU identifier: \"" + bkuIdentifier + "\"");
+      SignatureLayoutHandler sigLayout;
+      try {
+         sigLayout = SignatureLayoutHandlerFactory.getSignatureLayoutHandlerInstance(bkuIdentifier);
+      } catch (SettingsException e) {
+         throw new ConnectorException(e.getErrorCode(), e.getMessage());
+      }
+      
+//      SignSignatureObject so = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());
+      SignSignatureObject so = sigLayout.parseCreateXMLSignatureResponse(response_string);
       so.response_properties = response_properties;
       log.debug("analyzeSignResponse finished."); 
       return so;
@@ -275,21 +292,21 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
       protected static final String TEMPLATE_FILE_PREFIX = "./templates/moc.";
 
       /**
-       * signing file template sufix
+       * signing file template suffix
        */
-      protected static final String SIGN_TEMPLATE_FILE_SUFIX = ".sign.request.xml";
+      protected static final String SIGN_TEMPLATE_FILE_SUFFIX = ".sign.request.xml";
 
       /**
-       * verifing template file sufix
+       * verifing template file suffix
        */
       /* signature verification is not supported by mocca
       protected static final String VERIFY_REQUEST_TEMPLATE_FILE_SUFIX = ".verify.request.xml";
        */
 
       /**
-       * verifing file template key sufix
+       * verifing file template key suffix
        */
-      protected static final String VERIFY_TEMPLATE_SUFIX = ".verify.template.xml";
+      protected static final String VERIFY_TEMPLATE_SUFFIX = ".verify.template.xml";
 
       /**
        * The configuration key of the verify request template.
@@ -343,13 +360,16 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
       protected String cert_alg_ecdsa = null;
 
       protected String cert_alg_rsa = null;
+      
+      protected String algorithmId = null;
 
       /**
        * Initializes the environment with a given profile.
        * @param profile The configuration profile.
+       * @param algorithmId The algorithm identifer.
        * @throws ConnectorException Thrown in case of an error.
        */
-      public Environment(String profile, String loc_ref_content) throws ConnectorException {
+      public Environment(String profile, String loc_ref_content, String algorithmId) throws ConnectorException {
          this.profile = profile;
 
          this.loc_ref_content = loc_ref_content;
@@ -363,11 +383,16 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
 
          this.sign_keybox_identifier = getConnectorValueFromProfile(settings, profile, SIGN_KEYBOX_IDENTIFIER_KEY);
 
+         if (algorithmId == null) {
+            this.algorithmId = settings.getValueFromKey("default.moc.algorithm.id");
+         } else {
+            this.algorithmId = algorithmId;
+         }
 
          // SIGN REQUEST
          
          // try specific file
-         String sign_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moc.algorithm.id") + SIGN_TEMPLATE_FILE_SUFIX;
+         String sign_request_filename = TEMPLATE_FILE_PREFIX + this.algorithmId + SIGN_TEMPLATE_FILE_SUFFIX;
          log.debug("Trying to load specific sign request file " + sign_request_filename);
          this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));
 
@@ -410,7 +435,7 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
          
          // load template file
          // try specific file
-         String verify_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moc.algorithm.id") + VERIFY_TEMPLATE_SUFIX;
+         String verify_filename = TEMPLATE_FILE_PREFIX + this.algorithmId + VERIFY_TEMPLATE_SUFFIX;
          log.debug("Trying to load specific signature template file " + verify_filename);
          this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));