From 4ce2fbc415f2fae57842b2e13a0817bb63594434 Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Mon, 11 Jan 2010 10:58:48 +0000
Subject: - check implemented: responses are validated upon valid SL content
 (ErrorResponse, Create|VerifyXMLSignatureResponse) (ErrorCode 340) - new
 errorcode added (340: unable to receive suitable response) - default
 signature validation links changed (-> http://www.signaturpruefung.gv.at) -
 recognition of non-textual objects: static switch implemented allowing to
 configure behaviour (at compile time) in case of signatures (default
 behaviour: skip detection of all signatures as non-textual objects) - minor
 bug fixed: invalid evaluation of response charset resulting in invalid warn
 debug message - configuration updated - Default configuration updated

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@542 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../wag/egov/egiz/sig/connectors/bku/BKUHelper.java   | 19 ++++++++++++++++---
 .../egiz/sig/connectors/bku/BKUPostConnection.java    |  9 ++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/sig')

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 3b262c3..ac6e221 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
@@ -20,11 +20,11 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmMapper;
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteObject;
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteUtil;
 import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;
 import at.gv.egiz.pdfas.impl.input.helper.DataSourceHelper;
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
@@ -44,6 +44,8 @@ import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
 public final class BKUHelper
 {
 
+   private static final Pattern ALLOWED_SL_RESPONSE_PATTERN = Pattern.compile("^.*<[\\w]*:?(CreateXMLSignatureResponse|VerifyXMLSignatureResponse)[^>]*>(.*)</[\\w]*:?(CreateXMLSignatureResponse|VerifyXMLSignatureResponse)>.*$", Pattern.DOTALL);
+   
   /**
    * The log.
    */
@@ -119,7 +121,10 @@ public final class BKUHelper
    */
   public static void checkResponseForError(String response_string) throws ConnectorException
   {
-     log.debug("Checking response for error: " + response_string);
+     if (StringUtils.isEmpty(response_string)) {
+        throw new ConnectorException(ErrorCode.UNABLE_TO_RECEIVE_SUITABLE_RESPONSE, "No suitable response received.");
+     }
+    log.debug("Checking response for error: " + response_string);
     Pattern erc_p_s = Pattern.compile("<[\\w]*:?ErrorCode>"); //$NON-NLS-1$
     Pattern erc_p_e = Pattern.compile("</[\\w]*:?ErrorCode>"); //$NON-NLS-1$
     Matcher erc_m_s = erc_p_s.matcher(response_string);
@@ -141,6 +146,14 @@ public final class BKUHelper
       }
       throw new ExternalErrorException(error_code, error_mess);
     }
+    log.debug("No error found. Assuring that CreateXMLSignatureResponse or VerifyXMLSignatureResponse elements are available.");
+    
+    // assure that a CreateXMLSignatureResponse or a VerifyXMLSignatureResponse is available
+    Matcher slMatcher = ALLOWED_SL_RESPONSE_PATTERN.matcher(response_string);
+    if (!slMatcher.matches()) {
+       throw new ConnectorException(ErrorCode.UNABLE_TO_RECEIVE_SUITABLE_RESPONSE, "No suitable response received: " + response_string);
+    }
+    
   }
 
   /**
@@ -629,7 +642,7 @@ public final class BKUHelper
      }
      
      if (bkuSignatureLayout != null && result != null) {
-        log.info("BKU response header \"" + Constants.BKU_HEADER_SIGNATURE_LAYOUT + "\" found.");
+        log.debug("BKU response header \"" + Constants.BKU_HEADER_SIGNATURE_LAYOUT + "\" found.");
         String signatureLayoutData = " " + Constants.BKU_HEADER_SIGNATURE_LAYOUT + "/" + bkuSignatureLayout;
         if (!result.endsWith(signatureLayoutData)) {
            log.debug("Appending signature layout value \"" + bkuSignatureLayout + "\" to bku identifier.");
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 6ea8ced..5fa1877 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
@@ -142,11 +142,10 @@ public final class BKUPostConnection
     if (signatureLayoutHeader != null) {
        response_properties.setProperty(BKU_SIGNATURE_LAYOUT_HEADER_KEY, signatureLayoutHeader.getValue());
     }
-
-    log.debug(post_method.getResponseCharSet());
-    if (!post_method.getResponseCharSet().equals("UTF-8")) //$NON-NLS-1$
-    {
-      log.warn("BKU response charset is not UTF-8!"); //$NON-NLS-1$
+    
+    String responseCharSet = post_method.getResponseCharSet();
+    if (!"UTF8".equalsIgnoreCase(responseCharSet) && !"UTF-8".equalsIgnoreCase(responseCharSet)) {
+       log.warn("BKU response charset is not UTF-8!"); //$NON-NLS-1$
     }
     String response_string = post_method.getResponseBodyAsString();
 
-- 
cgit v1.2.3