PDF-AS API

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

1 files changed, 51 insertions, 0 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 8f0b79e..1ddd327 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
@@ -7,12 +7,17 @@ import java.io.UnsupportedEncodingException;
 import java.security.cert.CertificateException;

 import java.security.cert.CertificateFactory;

 import java.security.cert.X509Certificate;

+import java.text.DateFormat;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

 import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;

 import at.gv.egiz.pdfas.impl.input.helper.DataSourceHelper;

 

+import org.apache.commons.lang.StringUtils;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

@@ -421,12 +426,35 @@ public final class BKUHelper
     Matcher cert_m_s = cert_p_s.matcher(xmlResponse);

     Matcher cert_m_e = cert_p_e.matcher(xmlResponse);

 

+    Pattern hash_data_p_s = Pattern.compile("<HashInputData PartOf=\"SignedInfo\">"); //$NON-NLS-1$

+    Pattern hash_data_p_e = Pattern.compile("</HashInputData>"); //$NON-NLS-1$

+    Matcher hash_data_m_s = hash_data_p_s.matcher(xmlResponse);

+    Matcher hash_data_m_e = hash_data_p_e.matcher(xmlResponse);

+

+

     SignatureResponse sig_res = new SignatureResponse();

 

     // [tknall] start qualified certificate

     sig_res.setQualifiedCertificate(cert_qualified_m.find());

     // [tknall] stop qualified certificate

 

+    if (hash_data_m_s.find() && hash_data_m_e.find())

+    {

+      String hashInputData = xmlResponse.substring(hash_data_m_s.end(), hash_data_m_e.start());

+      

+      Pattern b64_p_s = Pattern.compile("<Base64Content>"); //$NON-NLS-1$

+      Pattern b64_p_e = Pattern.compile("</Base64Content>"); //$NON-NLS-1$

+      Matcher b64_m_s = b64_p_s.matcher(hashInputData);

+      Matcher b64_m_e = b64_p_e.matcher(hashInputData);

+

+      b64_m_s.find();

+      b64_m_e.find();

+      

+      String b64 = hashInputData.substring(b64_m_s.end(), b64_m_e.start());

+

+      sig_res.setHashInputData(b64);

+    }

+

     if (sub_nam_m_s.find() && sub_nam_m_e.find())

     {

       String sub_nam = xmlResponse.substring(sub_nam_m_s.end(), sub_nam_m_e.start());

@@ -508,4 +536,27 @@ public final class BKUHelper
     return sig_res;

   }

 

+  public static String formDateTimeElement(Date verificationTime)

+  {

+    return formDateTimeElement(verificationTime, null);

+  }

+

+  public static String formDateTimeElement(Date verificationTime, String namespace)

+  {

+    String nsPrefix = StringUtils.isBlank(namespace) ? "" : (namespace + ":");

+    

+    String dateTimeElement = "";

+    if (verificationTime != null)

+    {

+      log.debug("VerificationTime = " + verificationTime);

+

+      DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

+      df.setTimeZone(TimeZone.getTimeZone("UTC"));

+      String dateTime = df.format(verificationTime) + "Z";

+      log.debug("DateTime (VerificationTime in UTC) = " + dateTime);

+      

+      dateTimeElement = "<" + nsPrefix + "DateTime>" + dateTime + "</" + nsPrefix + "DateTime>";

+    };

+    return dateTimeElement;

+  }

 }