Parsing of PublicAuthority-Flag and PublicAuthority-Code from MOA-VerifyXMLSignatureResponses implemented.

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

1 files changed, 24 insertions, 4 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 68fcad4..9253955 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
@@ -2,7 +2,6 @@ package at.knowcenter.wag.egov.egiz.sig.connectors.bku;
 

 import java.io.ByteArrayInputStream;

 import java.io.IOException;

-import java.io.InputStream;

 import java.io.UnsupportedEncodingException;

 import java.security.cert.CertificateException;

 import java.security.cert.CertificateFactory;

@@ -14,13 +13,12 @@ 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;

 

+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;

 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

@@ -434,6 +432,28 @@ public final class BKUHelper
 

     SignatureResponse sig_res = new SignatureResponse();

 

+    // public authority (tknall)

+    Pattern publicAuthority_p = Pattern.compile("<PublicAuthority/>");

+    Matcher publicAuthority_m = publicAuthority_p.matcher(xmlResponse);

+    sig_res.setPublicAuthority(false);

+    sig_res.setPublicAuthorityCode(null);

+    if (publicAuthority_m.find()) {

+       sig_res.setPublicAuthority(true);

+    } else {

+       Matcher publicAuthority_m_s = Pattern.compile("<PublicAuthority>").matcher(xmlResponse);

+       Matcher publicAuthority_m_e = Pattern.compile("</PublicAuthority>").matcher(xmlResponse);

+       if (publicAuthority_m_s.find() && publicAuthority_m_e.find()) {

+          sig_res.setPublicAuthority(true);

+          String codePart = xmlResponse.substring(publicAuthority_m_s.end(), publicAuthority_m_e.start());

+          Matcher code_m_s = code_p_s.matcher(codePart);

+          Matcher code_m_e = code_p_e.matcher(codePart);

+          if (code_m_s.find() && code_m_e.find()) {

+             String code = codePart.substring(code_m_s.end(), code_m_e.start());

+             sig_res.setPublicAuthorityCode(code);

+          }

+       }

+    }

+

     // [tknall] start qualified certificate

     sig_res.setQualifiedCertificate(cert_qualified_m.find());

     // [tknall] stop qualified certificate