1 files changed, 16 insertions, 3 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 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.");