Switching to itext-2.1.5-rev3628.

itext library: minor adjustments for pdf-as
Adding new error code (103) for invalid pdfa/1b font configuration.
Minor updates for PDF/A support.
Support for local MOCCA CCS added.
Multi language for web application.
Encoding issue for web application fixed by implementing an EncodingFilter.
Dynamic sign upload form implemented.
Order of input fields for dynamic upload form changed.
MOCCA logo added to sign upload form.

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

3 files changed, 25 insertions, 2 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 9253955..cec8d6f 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
@@ -156,6 +156,9 @@ public final class BKUHelper
   public static SignSignatureObject parseCreateXMLResponse(String xmlResponse,

       IdFormatter id_formatter) throws ConnectorException

   {

+    if (log.isDebugEnabled()) {

+      log.debug("xmlResponse = " + xmlResponse);

+    }

     Pattern sig_val_p_s = Pattern.compile("<[\\w]*:?SignatureValue>"); //$NON-NLS-1$

     Pattern sig_val_p_e = Pattern.compile("</[\\w]*:?SignatureValue>"); //$NON-NLS-1$

     Pattern iss_nam_p_s = Pattern.compile("<[\\w]*:?X509IssuerName>"); //$NON-NLS-1$

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
index 1a720d8..b582715 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
@@ -41,6 +41,11 @@ public final class BKUPostConnection
   public static final String BKU_SERVER_HEADER_KEY = "BKU-Server-Header"; //$NON-NLS-1$

 

   /**

+   * The response Properties key that identifies the BKU User-Agent header.

+   */

+  public static final String BKU_USER_AGENT_HEADER_KEY = "BKU-User-Agent-Header"; //$NON-NLS-1$

+

+  /**

    * The log.

    */

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

@@ -119,7 +124,11 @@ public final class BKUPostConnection
       }

     }

     Header server_header = post_method.getResponseHeader("Server"); //$NON-NLS-1$

-    response_properties.setProperty(BKU_SERVER_HEADER_KEY, server_header.getValue());

+    if (server_header != null) {

+       response_properties.setProperty(BKU_SERVER_HEADER_KEY, server_header.getValue());

+    } else {

+       log.warn("BKU response header \"Server\" is empty.");

+    }

 

     log.debug(post_method.getResponseCharSet());

     if (!post_method.getResponseCharSet().equals("UTF-8")) //$NON-NLS-1$

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 5dbc0a6..d10afc6 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
@@ -21,7 +21,9 @@ 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.connectors.moa.DetachedLocRefMOAConnector;

+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.MOCCAHelper;

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

+import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;

 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;

@@ -123,10 +125,19 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     log.debug("analyzeSignResponse:"); //$NON-NLS-1$

 

     String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);

+    String bkuServerHeader = response_properties.getProperty(BKUPostConnection.BKU_SERVER_HEADER_KEY);

+    String bkuUserAgentHeader = response_properties.getProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY);

 

     BKUHelper.checkResponseForError(response_string);

 

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

+    SignSignatureObject so;

+    if (MOCCAHelper.isMOCCACCEId(bkuServerHeader == null ? bkuUserAgentHeader : bkuServerHeader)) {

+       log.debug("Evaluating response as MOCCA response.");

+       so = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());

+    } else {

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

+    }

+

     so.response_properties = response_properties;

 

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