2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
index 30212eb..c44f34b 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
@@ -115,6 +115,15 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
       log.debug("analyzeSignResponse:"); 
       String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);
       BKUHelper.checkResponseForError(response_string);
+      
+      // TODO[tknall] Parse server type and version in order to prevent unsupported cces from signing pdfs
+      String bkuServerHeader = response_properties.getProperty(BKUPostConnection.BKU_SERVER_HEADER_KEY);
+      String bkuUserAgentHeader = response_properties.getProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY);
+      // http://www.buergerkarte.at/konzept/securitylayer/spezifikation/aktuell/bindings/bindings.html#http.kodierung.response.dataurl
+      log.debug("BKU response header \"user-agent\" header:  " + bkuUserAgentHeader);
+      // http://www.buergerkarte.at/konzept/securitylayer/spezifikation/aktuell/bindings/bindings.html#http.kodierung.response.browser
+      log.debug("BKU response header \"server\"     header:  " + bkuServerHeader);
+
       SignSignatureObject so = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());
       so.response_properties = response_properties;
       log.debug("analyzeSignResponse finished."); 
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/MOCCAHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/MOCCAHelper.java
index 1bb89be..fe23584 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/MOCCAHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/MOCCAHelper.java
@@ -73,11 +73,11 @@ public final class MOCCAHelper {
          log.debug("xmlResponse = " + xmlResponse);
       }
 
-      Pattern iss_nam_p_s = Pattern.compile("<[\\w]*:?X509IssuerName>");
+      Pattern iss_nam_p_s = Pattern.compile("<[\\w]*:?X509IssuerName[^>]*>");
       Pattern iss_nam_p_e = Pattern.compile("</[\\w]*:?X509IssuerName>");
       Pattern sig_tim_p_s = Pattern.compile("<[\\w]*:?SigningTime>");
       Pattern sig_tim_p_e = Pattern.compile("</[\\w]*:?SigningTime>");
-      Pattern ser_num_p_s = Pattern.compile("<[\\w]*:?X509SerialNumber>");
+      Pattern ser_num_p_s = Pattern.compile("<[\\w]*:?X509SerialNumber[^>]*>");
       Pattern ser_num_p_e = Pattern.compile("</[\\w]*:?X509SerialNumber>");
       Pattern sig_cer_p_s = Pattern.compile("<[\\w]*:?X509Certificate>");
       Pattern sig_cer_p_e = Pattern.compile("</[\\w]*:?X509Certificate>");