web

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

5 files changed, 113 insertions, 29 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
index 78165c2..c05c688 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
@@ -50,10 +50,41 @@ public final class BKUHelper
     String base64 = CodingHelper.encodeBase64(data.getData());

     if (data.getMimeType().equals("application/pdf")) //$NON-NLS-1$

     {

-      log.debug("The data is application/pdf - so it is Base64 encoded again."); //$NON-NLS-1$

+      log.debug("The data is application/pdf - so the binary data is Base64 encoded."); //$NON-NLS-1$

       base64 = CodingHelper.encodeUTF8AsBase64(base64);

     }

     return base64;

+

+  }

+

+  /**

+   * Prepares the enveloping data.

+   * <p>

+   * This is useful for building the hash.

+   * </p>

+   * 

+   * @param data

+   *          The data to be prepared.

+   * @return Returns the prepared data.

+   */

+  public static byte[] prepareEnvelopingData(SignatureData data)

+  {

+    byte[] enc = data.getData();

+    if (data.getMimeType().equals("application/pdf")) //$NON-NLS-1$

+    {

+      log.debug("The data is application/pdf - so the binary data is Base64 encoded."); //$NON-NLS-1$

+      String base64 = CodingHelper.encodeBase64(enc);

+      try

+      {

+        enc = base64.getBytes("US-ASCII"); //$NON-NLS-1$

+      }

+      catch (UnsupportedEncodingException e)

+      {

+        e.printStackTrace();

+        throw new RuntimeException("Very Strange: US-ASCII encoding not supported???", e); //$NON-NLS-1$

+      }

+    }

+    return enc;

   }

 

   /**

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedMultipartBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index 68ff62e..44beb40 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedMultipartBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -16,6 +16,7 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

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

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

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

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

@@ -30,12 +31,12 @@ import at.knowcenter.wag.egov.egiz.tools.FileHelper;
  * 

  * @author wprinz

  */

-public class DetachedMultipartBKUConnector implements Connector

+public class DetachedBKUConnector implements Connector, LocalConnector

 {

   /**

    * The log.

    */

-  private static Log log = LogFactory.getLog(DetachedMultipartBKUConnector.class);

+  private static Log log = LogFactory.getLog(DetachedBKUConnector.class);

 

   /**

    * The environemnt configuration of this connector containing templates and

@@ -57,9 +58,9 @@ public class DetachedMultipartBKUConnector implements Connector
    * @throws ConnectorException

    *           f.e.

    */

-  public DetachedMultipartBKUConnector(String profile) throws ConnectorException

+  public DetachedBKUConnector(String profile, String loc_ref_content) throws ConnectorException

   {

-    this.environment = new Environment(profile);

+    this.environment = new Environment(profile, loc_ref_content);

   }

 

   /**

@@ -71,7 +72,7 @@ public class DetachedMultipartBKUConnector implements Connector
    * @throws ConnectorException

    *           f.e.

    */

-  protected String prepareSignRequestDetached(SignatureData data) throws ConnectorException

+  public String prepareSignRequest(SignatureData data) throws ConnectorException

   {

     log.debug("prepareSignRequestDetached:"); //$NON-NLS-1$

 

@@ -79,14 +80,17 @@ public class DetachedMultipartBKUConnector implements Connector
 

     String sign_keybox_identifier = this.environment.getSignKeyboxIdentifier();

     String mime_type = data.getMimeType();

+    String loc_ref_content = this.environment.getLocRefContent();

     if (log.isDebugEnabled())

     {

       log.debug("sign keybox identifier = " + sign_keybox_identifier); //$NON-NLS-1$

       log.debug("mime type = " + mime_type); //$NON-NLS-1$

+      log.debug("loc_ref_content = " + loc_ref_content); //$NON-NLS-1$

     }

 

     String sign_request_xml = sign_request_template.replaceFirst(TemplateReplaces.KEYBOX_IDENTIFIER_REPLACE, sign_keybox_identifier);

     sign_request_xml = sign_request_xml.replaceFirst(TemplateReplaces.MIME_TYPE_REPLACE, mime_type);

+    sign_request_xml = sign_request_xml.replaceFirst(TemplateReplaces.LOC_REF_CONTENT_REPLACE, loc_ref_content);

 

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

     return sign_request_xml;

@@ -220,7 +224,7 @@ public class DetachedMultipartBKUConnector implements Connector
   {

     log.debug("doSign:"); //$NON-NLS-1$

 

-    String sign_request_xml = prepareSignRequestDetached(data);

+    String sign_request_xml = prepareSignRequest(data);

     log.debug("sign_request_xml = " + sign_request_xml); //$NON-NLS-1$

 

     String url = this.environment.getSignURL();

@@ -250,7 +254,7 @@ public class DetachedMultipartBKUConnector implements Connector
   {

     log.debug("doVerify:"); //$NON-NLS-1$

 

-    String verify_request_xml = prepareVerifyRequestDetached(data, so);

+    String verify_request_xml = prepareVerifyRequest(data, so);

     log.debug("verify_request_xml = " + verify_request_xml); //$NON-NLS-1$

 

     // TODO debug

@@ -288,7 +292,7 @@ public class DetachedMultipartBKUConnector implements Connector
    * @throws ConnectorException

    *           f.e.

    */

-  public String prepareVerifyRequestDetached(SignatureData data,

+  public String prepareVerifyRequest(SignatureData data,

       SignSignatureObject so) throws ConnectorException

   {

     String verify_request_template = this.environment.getVerifyRequestTemplate();

@@ -309,7 +313,8 @@ public class DetachedMultipartBKUConnector implements Connector
     // }

 

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

+    

     return verify_request_xml;

   }

 

@@ -484,6 +489,8 @@ public class DetachedMultipartBKUConnector implements Connector
      */

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

 

+    protected String loc_ref_content = null;

+    

     protected String sign_keybox_identifier = null;

 

     protected String sign_request_template = null;

@@ -508,8 +515,10 @@ public class DetachedMultipartBKUConnector implements Connector
      * @throws ConnectorException

      *           f.e.

      */

-    public Environment(String profile) throws ConnectorException

+    public Environment(String profile, String loc_ref_content) throws ConnectorException

     {

+      this.loc_ref_content = loc_ref_content;

+      

       SettingsReader settings = null;

       try

       {

@@ -556,6 +565,15 @@ public class DetachedMultipartBKUConnector implements Connector
     }

 

     /**

+     * Returns the LocRef content.

+     * @return Returns the LocRef content.

+     */

+    public String getLocRefContent()

+    {

+      return this.loc_ref_content;

+    }

+    

+    /**

      * Returns the sign keybox identifier.

      * 

      * @return Returns the sign keybox identifier.

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 cabfe92..1c628b1 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
@@ -19,6 +19,7 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;

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

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

+import at.knowcenter.wag.egov.egiz.tools.DebugHelper;

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

 

 /**

@@ -66,11 +67,12 @@ public class EnvelopedBase64BKUConnector implements Connector
     log.debug("doSign:"); //$NON-NLS-1$

 

     String sign_request_xml = prepareSignRequest(data);

-    log.debug("sign_request_xml = " + sign_request_xml); //$NON-NLS-1$

+    DebugHelper.debugStringToFile(sign_request_xml, "BKU_EnvB64_sign_request.xml"); //$NON-NLS-1$

 

     String url = this.environment.getSignURL();

     Properties response_properties = sendRequest(url, sign_request_xml);

 

+    DebugHelper.debugStringToFile(response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY), "BKU_EnvB64_sign_response.xml"); //$NON-NLS-1$

     SignSignatureObject sso = analyzeSignResponse(response_properties);

 

     // TODO this could be made more generic

@@ -89,25 +91,12 @@ public class EnvelopedBase64BKUConnector implements Connector
     log.debug("doVerify:"); //$NON-NLS-1$

 

     String verify_request_xml = prepareVerifyRequest(data, so);

-    log.debug("verify_request_xml = " + verify_request_xml); //$NON-NLS-1$

-

-    // TODO debug

-    // try

-    // {

-    // FileOutputStream fos = new

-    // FileOutputStream("C:\\wprinz\\Filer\\egiz2\\verify_request.utf8.xml");

-    // //$NON-NLS-1$

-    // fos.write(verify_request_xml.getBytes("UTF-8")); //$NON-NLS-1$

-    // fos.close();

-    // }

-    // catch (Exception e)

-    // {

-    // log.error(e);

-    // }

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

 

     String url = this.environment.getVerifyURL();

     Properties response_properties = sendRequest(url, verify_request_xml);

 

+    DebugHelper.debugStringToFile(response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY), "BKU_EnvB64_verify_response.xml"); //$NON-NLS-1$

     SignatureResponse signature_response = analyzeVerifyResponse(response_properties);

 

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

@@ -180,8 +169,8 @@ public class EnvelopedBase64BKUConnector implements Connector
       String verify_xml = verify_template.replaceFirst(TemplateReplaces.CERT_ALG_REPLACE, cert_alg);

 

       // data digest replace

+      byte [] data_value = BKUHelper.prepareEnvelopingData(data);

       {

-        byte[] data_value = data.getData();

         byte[] data_value_hash = CodingHelper.buildDigest(data_value);

         String object_data_hash = CodingHelper.encodeBase64(data_value_hash);

 

@@ -203,7 +192,7 @@ public class EnvelopedBase64BKUConnector implements Connector
       verify_xml = verify_xml.replaceFirst(TemplateReplaces.X509_CERTIFICATE_REPLACE, x509_cert_string);

 

       // Base64 content replace

-      String base64 = BKUHelper.prepareBase64Content(data);

+      String base64 = CodingHelper.encodeBase64(data_value);

       verify_xml = verify_xml.replaceFirst(TemplateReplaces.BASE64_CONTENT_REPLACE, base64);

 

       // Qualified Properties replaces

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/LocRefDetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/LocRefDetachedBKUConnector.java
new file mode 100644
index 0000000..92b7b91
--- /dev/null
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/LocRefDetachedBKUConnector.java
@@ -0,0 +1,25 @@
+/**

+ * 

+ */

+package at.knowcenter.wag.egov.egiz.sig.connectors.bku;

+

+import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

+

+/**

+ * @author wprinz

+ *

+ */

+public class LocRefDetachedBKUConnector extends DetachedBKUConnector

+{

+

+  /**

+   * @param profile

+   * @param loc_ref_content

+   * @throws ConnectorException

+   */

+  public LocRefDetachedBKUConnector(String profile, String loc_ref_content) throws ConnectorException

+  {

+    super(profile, loc_ref_content);

+  }

+

+}

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/MultipartDetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/MultipartDetachedBKUConnector.java
new file mode 100644
index 0000000..a2d4dc0
--- /dev/null
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/MultipartDetachedBKUConnector.java
@@ -0,0 +1,21 @@
+/**

+ * 

+ */

+package at.knowcenter.wag.egov.egiz.sig.connectors.bku;

+

+import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

+

+/**

+ * @author wprinz

+ *

+ */

+public class MultipartDetachedBKUConnector extends DetachedBKUConnector

+{

+  protected static final String MULTIPART_LOC_REF_CONTENT = "formdata:fileupload"; //$NON-NLS-1$

+

+  public MultipartDetachedBKUConnector(String profile) throws ConnectorException

+  {

+    super(profile, MULTIPART_LOC_REF_CONTENT);

+  }

+

+}