Deprecated webapp-folder removed from svn repository.

New DefaultConfiguration.zip integrated in order to allow mocca signatures.
Minor bug concerning choice of cce within the web application fixed.
Signature with new online bku MOCCA integrated (new signature device "moc" created).
Configuration keys for mocca added.
New error codes (371 = signature verification not supported by this connector, 372 = invalid signing time) introduced.
Optional check of the signing time for the web application implemented. At signature creation time the signing time is checked for plausibility. This is a workaround for the ITS:mac-linux signing time bug. New configuration key ("signing_time_tolerance") added (applies to web application only) to overcome invalid signing times. A signature is only accepted if its signing time is within a time frame of [current time - signing_time_tolerance, current time + signing_time_tolerance] where signing_time_tolerance is interpreted as seconds.
Bugfix: Correct extraction of signatures with wrong signing times implemented. (The order of the signatures is still invalid in case of false signing times.)
Optional override of the dynamic creation of the signature retrieval url (locrefcontent) implemented in order to overcome ssl problems (retrieve_signature_data_url_override). Note: Assure that this URL is accessible from the citizen card environment.
Download of signed pdf-file for external application interface adjusted.
Verification of mocca signed documents implemented.
Retrieval of xml response via multipart implemented (mocca strictly follows security layer spec)


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

3 files changed, 28 insertions, 14 deletions

diff --git a/src/main/webapp/jsp/download.jsp b/src/main/webapp/jsp/download.jsp
index 841f1d0..76180cc 100644
--- a/src/main/webapp/jsp/download.jsp
+++ b/src/main/webapp/jsp/download.jsp
@@ -32,11 +32,11 @@
 		<h2>Dokument Signatur erstellen</h2>

 		<div class="pdfasnote">Der Signatur-Vorgang ist abgeschlossen. Das signierte Dokument kann nun heruntergeladen werden.<br/>Hinweis: Der Download ist nur einmalig m&ouml;glich. Das Dokument wird nicht am Server gespeichert.</div>

 		<div class="pdfasverticalspace"></div>

-		<form action="<%= downloadURL %>" name="submitform" accept-charset="UTF-8" method="post">

+		<form action="<%= downloadURL %>" name="submitform" accept-charset="UTF-8" method="post" enctype="application/x-www-form-urlencoded">

 			<input type="submit" id="SendRequestButton" value="Signiertes Dokument herunterladen" onclick="return hitButton();"/>

 		</form>

 		<div class="pdfasverticalspace"></div>

 		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>

 	</body>

-

+	

 </html>

diff --git a/src/main/webapp/jsp/signpreview.jsp b/src/main/webapp/jsp/signpreview.jsp
index 6ff6da6..ee97497 100644
--- a/src/main/webapp/jsp/signpreview.jsp
+++ b/src/main/webapp/jsp/signpreview.jsp
@@ -4,6 +4,7 @@
 <%@ page import="at.gv.egiz.pdfas.web.SignSessionInformation" %>

 <%@ page import="at.gv.egiz.pdfas.impl.input.TextDataSourceImpl"%>

 <%@page import="org.apache.commons.lang.StringEscapeUtils"%>

+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>

 

 <%

   SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);

@@ -35,11 +36,13 @@
 		%>

 			<form action="<%= submit_url %>" name="submitform" enctype="multipart/form-data" accept-charset="UTF-8" method="get">

 				<pre class="pdfasnt"><%= document_text != null ? document_text : "" %></pre>

-				<div>

-					<!-- =============================================== Start BKU-Erkennung -->

-					<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

-					<!-- ================================================ Stop BKU-Erkennung -->

-				</div>

+				<% if (Constants.SIGNATURE_DEVICE_BKU.equals(si.connector)) { %>

+					<div>

+						<!-- =============================================== Start BKU-Erkennung -->

+						<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

+						<!-- ================================================ Stop BKU-Erkennung -->

+					</div>

+				<% } // end if %>

 				<input type="submit" value="Signieren..." />

 			</form>

 		<%

@@ -50,11 +53,13 @@
 				<input type="submit" value="Vorschaudokument anzeigen..." />

 			</form>

 			<div class="pdfasverticalspace"></div>

-			<div>

-				<!-- =============================================== Start BKU-Erkennung -->

-				<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

-				<!-- ================================================ Stop BKU-Erkennung -->

-			</div>

+			<% if (Constants.SIGNATURE_DEVICE_BKU.equals(si.connector)) { %>

+				<div>

+					<!-- =============================================== Start BKU-Erkennung -->

+					<iframe src="bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

+					<!-- ================================================ Stop BKU-Erkennung -->

+				</div>

+			<% } // end if %>

 			<form action="<%= submit_url %>" method="get">

 				<input type="submit" value="Signieren..." />

 			</form>

diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp
index e6c243f..3db3be5 100644
--- a/src/main/webapp/jsp/signupload.jsp
+++ b/src/main/webapp/jsp/signupload.jsp
@@ -1,5 +1,6 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>

 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>

+<%@ page import="at.gv.egiz.pdfas.api.commons.Constants" %>

 

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

 <html>

@@ -19,7 +20,7 @@
 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">

 		<tr>

 			<td nowrap="nowrap"><label>PDF Datei:</label></td>

-			<td><input size="50" type="file" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf" /></td>

+			<td><input size="50" type="file" name="<%= FormFields.FIELD_UPLOAD %>" accept="application/pdf"/></td>

 		</tr>

 		<tr>

 			<td nowrap="nowrap"><label>Signatur Typ:</label></td>

@@ -43,10 +44,18 @@
 				</select>

 			</td>

 		</tr>

+		<tr>

+			<td nowrap="nowrap"><label>Signaturger&auml;t:</label></td>

+			<td>

+				<select name="connector">

+					<option value="<%= Constants.SIGNATURE_DEVICE_BKU %>">BKU</option>

+					<option value="<%= Constants.SIGNATURE_DEVICE_MOC %>" selected="selected">MOCCA</option>

+				</select>

+			</td>

+		</tr>

 	</table>

 	<div class="pdfasnote"><span class="pdfasemphasis">Bitte beachten Sie:</span> Im textuellen Modus signierte Dokumente k&ouml;nnen nur dann gepr&uuml;ft werden, wenn das Zertifikat in einem Verzeichnisdienst verf&uuml;gbar ist.</div>

 

-	<input type="hidden" name="connector" value="bku"/>

 	<input type="hidden" name="<%= FormFields.FIELD_DOWNLOAD %>" value="<%= FormFields.VALUE_DOWNLOAD_ATTACHMENT %>"/>

 	<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />