PDF-AS API

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

4 files changed, 71 insertions, 9 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;

+  }

 }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index c84ce8a..f1896d7 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -11,6 +11,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 

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

@@ -43,6 +44,11 @@ public class DetachedBKUConnector implements Connector, LocalConnector
   private static Log log = LogFactory.getLog(DetachedBKUConnector.class);

 

   /**

+   * The connector parameters.

+   */

+  protected ConnectorParameters params = null;

+

+  /**

    * The environemnt configuration of this connector containing templates and

    * other configurable elements.

    */

@@ -57,14 +63,15 @@ public class DetachedBKUConnector implements Connector, LocalConnector
    * parameters defined in the configuration are used.

    * </p>

    * 

-   * @param profile

-   *          The profile from which the Environment should be assembled.

+   * @param connectorParameters

+   *          The connectot parameters.

    * @throws ConnectorException

    *           f.e.

    */

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

+  public DetachedBKUConnector(ConnectorParameters connectorParameters, String loc_ref_content) throws ConnectorException

   {

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

+    this.params = connectorParameters;

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

   }

 

   /**

@@ -119,6 +126,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     BKUHelper.checkResponseForError(response_string);

 

     SignSignatureObject so = BKUHelper.parseCreateXMLResponse(response_string, new DetachedIdFormatter());

+    so.response_properties = response_properties;

 

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

     return so;

@@ -309,6 +317,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

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

+    verify_request_xml = verify_request_xml.replaceFirst(TemplateReplaces.DATE_TIME_REPLACE, BKUHelper.formDateTimeElement(this.params.getVerificationTime(), "sl"));

 

     return verify_request_xml;

   }

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
index 92b7b91..fc29457 100644
--- 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
@@ -3,6 +3,7 @@
  */

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

 

+import at.gv.egiz.pdfas.framework.ConnectorParameters;

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

 

 /**

@@ -13,13 +14,13 @@ public class LocRefDetachedBKUConnector extends DetachedBKUConnector
 {

 

   /**

-   * @param profile

+   * @param connectorParameters

    * @param loc_ref_content

    * @throws ConnectorException

    */

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

+  public LocRefDetachedBKUConnector(ConnectorParameters connectorParameters, String loc_ref_content) throws ConnectorException

   {

-    super(profile, loc_ref_content);

+    super(connectorParameters, 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
index a2d4dc0..6f189af 100644
--- 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
@@ -3,6 +3,7 @@
  */

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

 

+import at.gv.egiz.pdfas.framework.ConnectorParameters;

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

 

 /**

@@ -13,9 +14,9 @@ public class MultipartDetachedBKUConnector extends DetachedBKUConnector
 {

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

 

-  public MultipartDetachedBKUConnector(String profile) throws ConnectorException

+  public MultipartDetachedBKUConnector(ConnectorParameters connectorParameters) throws ConnectorException

   {

-    super(profile, MULTIPART_LOC_REF_CONTENT);

+    super(connectorParameters, MULTIPART_LOC_REF_CONTENT);

   }

 

 }