detached connectors

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

1 files changed, 36 insertions, 22 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
index f6580af..a29df2a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
@@ -15,11 +15,15 @@ import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorChooser;

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

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.OldEnvelopingBase64BKUConnector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;

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

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

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

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

 

@@ -140,7 +144,7 @@ public class EnvelopingBase64MOAConnector implements Connector
     log.debug("prepareSignRequest finished."); //$NON-NLS-1$

     return sign_request_xml;

   }

-  

+

   /**

    * Prepares the verify request xml to be sent using the verify request

    * template.

@@ -153,25 +157,28 @@ public class EnvelopingBase64MOAConnector implements Connector
    * @throws ConnectorException

    *           f.e.

    */

-  public String prepareVerifyRequest(SignatureData data,

-      SignSignatureObject so) throws ConnectorException

+  public String prepareVerifyRequest(SignatureData data, SignSignatureObject so) throws ConnectorException

   {

     String verify_request_template = this.environment.getVerifyRequestTemplate();

 

     String xml_content = null;

-    // TODO implement MOA

-    // if (sigObject.isMOASigned())

-    // {

-    // MOAConnector moa_conn = new MOAConnector();

-    // // get the MOA-template

-    // verify_template_str = moa_conn.getVerifyTemplate(normalizedText,

-    // sigObject);

-    // }

-    // else

-    // {

-    // get the BKU-template

-    xml_content = prepareXMLContent(data, so);

-    // }

+    if (!SigKZIDHelper.isMOASigned(so))

+    {

+      if (SigKZIDHelper.isOldBKU(so))

+      {

+        OldEnvelopingBase64BKUConnector bku_connector = new OldEnvelopingBase64BKUConnector(this.environment.getProfile());

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

+      }

+      else

+      {

+        EnvelopedBase64BKUConnector bku_connector = new EnvelopedBase64BKUConnector(this.environment.getProfile());

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

+      }

+    }

+    else

+    {

+      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.TRUST_PROFILE_ID_REPLACE, this.environment.getVerifyTrustProfileId());

@@ -226,7 +233,6 @@ public class EnvelopingBase64MOAConnector implements Connector
     return signature_response;

   }

 

-  

   /**

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

    * 

@@ -355,12 +361,11 @@ public class EnvelopingBase64MOAConnector implements Connector
      * The configuration key of the verify URL.

      */

     protected static final String VERIFY_URL_KEY = "moa.verify.url"; //$NON-NLS-1$

-    

+

     /**

      * The configuration key of the trust profile id.

      */

-    protected static final String VERIFY_TRUST_PROFILE_ID = "moa.verify.TrustProfileID";  //$NON-NLS-1$

-    

+    protected static final String VERIFY_TRUST_PROFILE_ID = "moa.verify.TrustProfileID"; //$NON-NLS-1$

 

     /**

      * The configuration key for the ECDSA cert alg property.

@@ -371,6 +376,8 @@ public class EnvelopingBase64MOAConnector implements Connector
      * The configuration key for the RSA cert alg property.

      */

     protected static final String RSA_CERT_ALG_KEY = "cert.alg.rsa"; //$NON-NLS-1$

+    

+    protected String profile = null;

 

     protected String sign_key_identifier = null;

 

@@ -383,7 +390,7 @@ public class EnvelopingBase64MOAConnector implements Connector
     protected String verify_template = null;

 

     protected String verify_url = null;

-    

+

     protected String verify_trust_profile_id = null;

 

     protected String cert_alg_ecdsa = null;

@@ -395,11 +402,13 @@ public class EnvelopingBase64MOAConnector implements Connector
      * 

      * @param profile

      *          The configuration profile.

-      * @throws ConnectorException

+     * @throws ConnectorException

      *           f.e.

      */

     public Environment(String profile) throws ConnectorException

     {

+      this.profile = profile;

+      

       SettingsReader settings = null;

       try

       {

@@ -444,6 +453,11 @@ public class EnvelopingBase64MOAConnector implements Connector
       this.cert_alg_rsa = settings.getValueFromKey(RSA_CERT_ALG_KEY);

 

     }

+    

+    public String getProfile()

+    {

+      return this.profile;

+    }

 

     /**

      * Returns the sign key identifier.