QualifiedCertificate property (moa/bku) is now being evaluatedREL-2.34@31

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

6 files changed, 52 insertions, 9 deletions

diff --git a/pom.xml b/pom.xml
index c6ba4b7..f93907c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>knowcenter</groupId>

 	<artifactId>pdf-as</artifactId>

 	<name>PDF-AS</name>

-	<version>2.33</version>

+	<version>2.34</version>

 

 	<description>Amtssignatur fuer elektronische Aktenfuehrung</description>

 	<url>http://www.egiz.gv.at</url>

@@ -114,9 +114,7 @@
 			</plugin>

 

 			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-javadoc-plugin</artifactId>

-				<!-- version>2.1</version-->

 				<configuration>

 					<additionalparam></additionalparam>

 					<public>true</public>

@@ -125,16 +123,12 @@
 					<links>

 						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>

 						<link>http://java.sun.com/j2ee/1.4/docs/api/</link>

-						<link>http://struts.apache.org/1.2.9/api/</link>

 						<link>http://logging.apache.org/log4j/docs/api/</link>

 					</links>

 					<source>1.5</source>

 					<target>1.5</target>

-					<windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>

-					<bottom>

-						Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}"

-						target="_blank">${pom.organization.name}&lt;/a>. All Rights Reserved.

-					</bottom>

+					<verbose>true</verbose>

+					<windowtitle>${pom.name} v${pom.version} API</windowtitle>

 				</configuration>

 			</plugin>

 

diff --git a/release/2.34/pdf-as-2.34.jar b/release/2.34/pdf-as-2.34.jar
new file mode 100644
index 0000000..dad47cf
--- /dev/null
+++ b/release/2.34/pdf-as-2.34.jar
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
index f576e65..603e0fe 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
@@ -98,6 +98,10 @@ public class SignatureResponse
    */

   protected X509Cert certificate_ = null;

 

+  // [tknall] start qualified certificate

+  private boolean qualifiedCertificate = false;

+  // [tknall] stop qualified certificate

+  

   // /**

   // * Flag the marks that the response is an error response

   // */

@@ -315,6 +319,25 @@ public class SignatureResponse
     certificateCheckInfo_ = certificateCheckInfo;

   }

 

+  // [tknall] start qualified certificate

+  

+  /**

+   * Returns <code>true</code> if certificate is qualified, <code>false</code> if not.

+   * @return <code>true</code> if certificate is qualified, <code>false</code> if not.

+   */

+  public boolean isQualifiedCertificate() {

+	return this.qualifiedCertificate;

+  }

+

+  /**

+   * Sets the flag for qualified certificate.

+   * @param qualifiedCertificate The new qualified certificate status.

+   */

+  public void setQualifiedCertificate(boolean qualifiedCertificate) {

+	  this.qualifiedCertificate = qualifiedCertificate;

+  }

+  // [tknall] stop qualified certificate

+

   /**

    * @return Returns the signatureCheckInfo.

    */

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
index 96fa81b..3b672f1 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
@@ -441,6 +441,11 @@ public class BKUConnector implements LocalConnector
     Pattern cer_chk_p_s = Pattern.compile("<sl:CertificateCheck>");

     Pattern cer_chk_p_e = Pattern.compile("</sl:CertificateCheck>");

 

+    // [tknall] start qualified certificate

+    Pattern cert_qualified_p = Pattern.compile("<sl:QualifiedCertificate/>");

+    Matcher cert_qualified_m = cert_qualified_p.matcher(xmlResponse);

+    // [tknall] stop qualified certificate

+    

     Pattern code_p_s = Pattern.compile("<sl:Code>");

     Pattern code_p_e = Pattern.compile("</sl:Code>");

     Pattern info_p_s = Pattern.compile("<sl:Info>");

@@ -467,6 +472,11 @@ public class BKUConnector implements LocalConnector
     Matcher cert_m_e = cert_p_e.matcher(xmlResponse);

 

     SignatureResponse sig_res = new SignatureResponse();

+    

+    // [tknall] start qualified certificate

+    sig_res.setQualifiedCertificate(cert_qualified_m.find());

+    // [tknall] stop qualified certificate

+

     if (sub_nam_m_s.find() && sub_nam_m_e.find())

     {

       String sub_nam = xmlResponse.substring(sub_nam_m_s.end(), sub_nam_m_e.start());

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
index 5e323a2..3c53b54 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
@@ -626,6 +626,11 @@ public class MOAConnector implements Connector
     Pattern ser_num_p_s = Pattern.compile("<dsig:X509SerialNumber>");

     Pattern ser_num_p_e = Pattern.compile("</dsig:X509SerialNumber>");

 

+    // [tknall] start qualified certificate

+    Pattern cert_qualified_p = Pattern.compile("<QualifiedCertificate/>");

+    Matcher cert_qualified_m = cert_qualified_p.matcher(xmlResponse);

+    // [tknall] stop qualified certificate

+    

     Pattern sig_chk_p_s = Pattern.compile("<SignatureCheck>");

     Pattern sig_chk_p_e = Pattern.compile("</SignatureCheck>");

     Pattern man_chk_p_s = Pattern.compile("<SignatureManifestCheck>");

@@ -657,6 +662,11 @@ public class MOAConnector implements Connector
     Matcher cert_m_e = cert_p_e.matcher(xmlResponse);

 

     SignatureResponse sig_res = new SignatureResponse();

+    

+    // [tknall] start qualified certificate

+    sig_res.setQualifiedCertificate(cert_qualified_m.find());

+    // [tknall] stop qualified certificate

+

     if (sub_nam_m_s.find() && sub_nam_m_e.find())

     {

       String sub_nam = xmlResponse.substring(sub_nam_m_s.end(), sub_nam_m_e.start());

diff --git a/src/site/changes.xml b/src/site/changes.xml
index e6cf055..488d468 100644
--- a/src/site/changes.xml
+++ b/src/site/changes.xml
@@ -13,6 +13,12 @@
 			</release>

 		-->

 

+		<release version="2.34" date="2007-01-10" description="subsequent release">

+			<action dev="tknall" type="add">

+				QualifiedCertificate property (moa/bku) is now being evaluated

+			</action>

+		</release>

+

 		<release version="2.33" date="2006-12-14" description="subsequent release">

 			<action dev="tknall" type="update">

 				basic authentication for logging disabled