web

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

1 files changed, 7 insertions, 18 deletions

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