From 6ef9bdefc58cb2553f23aaa9711d6341e293c9f7 Mon Sep 17 00:00:00 2001 From: tknall Date: Fri, 10 Oct 2008 11:13:40 +0000 Subject: 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 --- webapp/jsp/dataok.jsp | 24 -------- webapp/jsp/error.jsp | 52 ----------------- webapp/jsp/local_connection_page.jsp | 49 ---------------- webapp/jsp/null_request_page.jsp | 48 ---------------- webapp/jsp/redirect_refresh_page.jsp | 36 ------------ webapp/jsp/results.jsp | 106 ----------------------------------- webapp/jsp/signpreview.jsp | 93 ------------------------------ webapp/jsp/signupload.jsp | 81 -------------------------- webapp/jsp/verifylist.jsp | 98 -------------------------------- webapp/jsp/verifypreview.jsp | 80 -------------------------- webapp/jsp/verifyupload.jsp | 100 --------------------------------- 11 files changed, 767 deletions(-) delete mode 100644 webapp/jsp/dataok.jsp delete mode 100644 webapp/jsp/error.jsp delete mode 100644 webapp/jsp/local_connection_page.jsp delete mode 100644 webapp/jsp/null_request_page.jsp delete mode 100644 webapp/jsp/redirect_refresh_page.jsp delete mode 100644 webapp/jsp/results.jsp delete mode 100644 webapp/jsp/signpreview.jsp delete mode 100644 webapp/jsp/signupload.jsp delete mode 100644 webapp/jsp/verifylist.jsp delete mode 100644 webapp/jsp/verifypreview.jsp delete mode 100644 webapp/jsp/verifyupload.jsp (limited to 'webapp/jsp') diff --git a/webapp/jsp/dataok.jsp b/webapp/jsp/dataok.jsp deleted file mode 100644 index 7fc1b96..0000000 --- a/webapp/jsp/dataok.jsp +++ /dev/null @@ -1,24 +0,0 @@ - - - -PDF-AS Amtssignaturen - - - -
-

PDF-AS Amtssignaturen

-
-
Datenänderung
- -

-Die Daten wurden erfolgreich übernommen. -

- -
-<% - String btlurl = (String)request.getAttribute("btlurl"); -%> -zurück zur Liste -
- - \ No newline at end of file diff --git a/webapp/jsp/error.jsp b/webapp/jsp/error.jsp deleted file mode 100644 index 90120b6..0000000 --- a/webapp/jsp/error.jsp +++ /dev/null @@ -1,52 +0,0 @@ -<%@ page isErrorPage="true" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.SignServlet" %> -<%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %> -<%@ page import="java.io.*" %> - - - - -PDF-AS Amtssignaturen Resultat - - - -<% - PresentableException pe = (PresentableException)request.getAttribute("PresentableException"); - if (exception != null && exception instanceof PresentableException) - { - pe = (PresentableException)exception; - SignServlet.prepareDispatchToErrorPage(pe, request); - } - - String error = (request.getAttribute("error") == null ? "" : request.getAttribute("error").toString()); - String cause = (request.getAttribute("cause") == null ? "" : request.getAttribute("cause").toString()); -%> -
-

PDF-AS Amtssignaturen

-
-
Ein Fehler ist aufgetreten
-
-<%= error %>
-
Grund: -
-<%= cause %> -
-
-Weiter... -
-
-<%
-  if (pe != null)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-    pe.printStackTrace(pw);
-    sw.close();
-    pw.close();
-    out.print(sw);
-  }
-%>
-
- - \ No newline at end of file diff --git a/webapp/jsp/local_connection_page.jsp b/webapp/jsp/local_connection_page.jsp deleted file mode 100644 index 16c7ea1..0000000 --- a/webapp/jsp/local_connection_page.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<% - String local_request_url = (String)request.getAttribute("local_request_url"); - String quoted_request = (String)request.getAttribute("quoted_request"); - String data_url = (String)request.getAttribute("data_url"); - String redirect_url = (String)request.getAttribute("redirect_url"); -%> - - - - -PDF-AS Amtssignaturen Lokale Verbindung - - - - -
- -

PDF-AS Amtssignaturen

- -
-
Verbindung zu BKU/A1
- -
Die Verbindung wird hergestellt.
Bitte haben sie etwas Geduld.
- - -
- - - - - - - - - - - -
- - -
-zurück -
- - diff --git a/webapp/jsp/null_request_page.jsp b/webapp/jsp/null_request_page.jsp deleted file mode 100644 index c6786d7..0000000 --- a/webapp/jsp/null_request_page.jsp +++ /dev/null @@ -1,48 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<% - String local_request_url = (String)request.getAttribute("local_request_url"); - String data_url = (String)request.getAttribute("data_url"); -%> - - - - -PDF-AS Amtssignaturen Lokale Verbindung - - - - - - -
- -

PDF-AS Amtssignaturen

- -
-
Verbindung zu BKU/A1
- -
Die Verbindung wird hergestellt.
Bitte haben sie etwas Geduld.
- - -
- - - - - - - - - - -
- - -
-zurück -
- - \ No newline at end of file diff --git a/webapp/jsp/redirect_refresh_page.jsp b/webapp/jsp/redirect_refresh_page.jsp deleted file mode 100644 index ee047c9..0000000 --- a/webapp/jsp/redirect_refresh_page.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<% - String refresh_url = (String)request.getAttribute("refresh_url"); -%> - - - - - - - -PDF-AS Amtssignaturen Lokale Verbindung - - - - -
- -

PDF-AS Amtssignaturen

- -
-
Verbindung zu BKU/A1
- -
Bitte warten.
Sobald ein Ergebnis vorliegt, wird es hier angezeigt.
- -
-Diese Seite lädt sich automatisch neu.
-Sollte dies nicht funktionieren, so folgen Sie bitte diesem Link:
-<%= refresh_url %> -
- -
-zurück -
- - diff --git a/webapp/jsp/results.jsp b/webapp/jsp/results.jsp deleted file mode 100644 index d98fcd3..0000000 --- a/webapp/jsp/results.jsp +++ /dev/null @@ -1,106 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureResponse" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %> - -<% - List results = (List) request.getAttribute("results"); - Object bb = request.getAttribute("backbutton"); - String btlurl = (String)request.getAttribute("btlurl"); - boolean backbutton = true; - if (bb != null && bb.equals("false")) - { - backbutton = false; - } -%> - - - - - PDF-AS Amtssignaturen Resultat - - - -
-

PDF-AS Amtssignaturen

-
-
Resultat
- -
-<% - Iterator resit = results.iterator(); - while (resit.hasNext()) - { - SignatureResponse result = (SignatureResponse) resit.next(); -%> - - - - -
Zertifikat - - - - - -<% - List public_properties = result.getPublicProperties(); - Iterator propit = public_properties.iterator(); - while (propit.hasNext()) - { - String public_property = (String) propit.next(); -%> - -<% - } -%> - - -
Signator:<%= result.getX509SubjectName() %>
Aussteller:<%= result.getX509IssuerName() %>
Seriennummer:<%= result.getX509SerialNumber() %>
Eigenschaft:<%= public_property %>
Zertifikat:<%= result.getCertificateCheckInfo() %>
-
-
Signatur-Check -
<%= result.getSignatureCheckInfo() %>
-
-
Manifest-Check -
<%= result.getSignatureManifestCheckInfo() %>
-
- - - - - -<% - if (resit.hasNext()) - { -%> -
-<% - } - } -%> -
- -
-<% - if (backbutton) - { -%> -zurück -<% - } - if (btlurl != null) - { -%> -zurück zur Liste -<% - } -%> - -
- - - - - - diff --git a/webapp/jsp/signpreview.jsp b/webapp/jsp/signpreview.jsp deleted file mode 100644 index 897aec2..0000000 --- a/webapp/jsp/signpreview.jsp +++ /dev/null @@ -1,93 +0,0 @@ -<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %> -<%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureData" %> -<%@ page import="at.gv.egiz.pdfas.web.SignSessionInformation" %> -<%@page import="at.gv.egiz.pdfas.impl.input.TextDataSourceImpl"%> -<% - SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION); - - String submit_url = (String)request.getAttribute("submit_url"); - - String signature_data_url = (String)request.getAttribute("signature_data_url"); - - String document_text = null; - if (si.mode.equals(FormFields.VALUE_MODE_TEXTUAL)) - { - SignatureData data = si.si.getSignatureData(); - TextDataSourceImpl tds = (TextDataSourceImpl)data.getDataSource(); - document_text = tds.getText(); - } -%> - - - - - PDF-AS Amtssignaturen Vorschau - - - -
-

PDF-AS Amtssignaturen

-
-
Vorschau: Dokument Signieren
- - -<% - if (si.mode.equals(FormFields.VALUE_MODE_TEXTUAL)) - { -%> -
-
- - -
<%= document_text %>
- -
- - - -
-
- - -<% - } - else - { -%> - -
-
- - - -
-
- -
- -
-
- - - -
-
- -<% - } -%> - - -
-zurück -
- - diff --git a/webapp/jsp/signupload.jsp b/webapp/jsp/signupload.jsp deleted file mode 100644 index 1474da5..0000000 --- a/webapp/jsp/signupload.jsp +++ /dev/null @@ -1,81 +0,0 @@ -<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %> - - - - PDF-AS Amtssignaturen - - - -
-

PDF-AS Amtssignaturen

-
-
Dokument Signatur erstellen
- -
- -
- - -
-
- - - - - -
- - - -<%= FormFields.generateTypeSelectBox() %> - -
- - - -<%= FormFields.generateConnectorSelectBox() %> - -
- - - - - -
- - - - - -
-
- - - - - - - - -
-
- -
-zurück -
- - \ No newline at end of file diff --git a/webapp/jsp/verifylist.jsp b/webapp/jsp/verifylist.jsp deleted file mode 100644 index 3d4cf6d..0000000 --- a/webapp/jsp/verifylist.jsp +++ /dev/null @@ -1,98 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ page errorPage="error.jsp" %> -<%@ page import="java.util.List" %> -<%@ page import="at.knowcenter.wag.egov.egiz.pdf.SignatureHolder" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %> -<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %> -<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%> -<% - - VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request); - - List signature_holders = si.signature_holders; - -%> - - - - - PDF-AS Amtssignaturen Vorschau - - - -
-

PDF-AS Amtssignaturen

-
-<% - if (signature_holders.size() > 1) - { -%> -
Extrahierte Signaturen
-<% - } - else - { -%> -
Extrahierte Signatur
-<% - } -%> - - -
- - -<% - for (int i = 0; i < signature_holders.size(); i++) - { - SignatureHolder holder = (SignatureHolder) signature_holders.get(i); -%> - - -<%= VerifyPreviewServlet.renderRequiredKeysText(holder.getSignatureObject()) %> - -
" - accept-charset="UTF-8" - method="get" - style="float:left;"> - - - - -
- -
" - accept-charset="UTF-8" - method="get" - style="float:left;"> - - - - -
- -
- -<% - } -%> - -
" - accept-charset="UTF-8" - method="get"> - - - - -
- - -
- -
-zurück -
- - \ No newline at end of file diff --git a/webapp/jsp/verifypreview.jsp b/webapp/jsp/verifypreview.jsp deleted file mode 100644 index 13cbd67..0000000 --- a/webapp/jsp/verifypreview.jsp +++ /dev/null @@ -1,80 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ page errorPage="error.jsp" %> -<%@ page import="java.util.List" %> -<%@ page import="at.knowcenter.wag.egov.egiz.pdf.SignatureHolder" %> -<%@ page import="at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %> -<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %> -<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %> -<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%> -<% - String btlurl = (String)request.getAttribute("btlurl"); - - VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request); - - List signature_holders = si.signature_holders; - Integer ver_wh = (Integer) request.getAttribute(FormFields.FIELD_VERIFY_WHICH); - int verify_which = ver_wh.intValue(); - SignatureHolder signature_holder = (SignatureHolder) signature_holders.get(verify_which); - -%> - - - - -PDF-AS Amtssignaturen Vorschau - - - - - - - -
- -

PDF-AS Amtssignaturen

- -
-
Vorschau: Dokument Prüfen
- -
" - name="submitform" - enctype="multipart/form-data" - accept-charset="UTF-8" - method="post"> -
- - - - -
Rekonstruktion der Signaturmarke:
- - -<%= VerifyPreviewServlet.renderRequiredKeys(signature_holder.getSignatureObject(), "", false) %> - -
- - - - - - - -
-
- -
- -zurück -zurück zur Liste - -
- - - diff --git a/webapp/jsp/verifyupload.jsp b/webapp/jsp/verifyupload.jsp deleted file mode 100644 index a33883d..0000000 --- a/webapp/jsp/verifyupload.jsp +++ /dev/null @@ -1,100 +0,0 @@ -<%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %> -<%@ page contentType="text/html; charset=UTF-8" %> -<% - boolean freetext_entry = false; - String parameter_freetext = (String)request.getParameter(FormFields.PARAMETER_FREE_TEXT_ENTRY); - if (parameter_freetext != null && parameter_freetext.equals(FormFields.VALUE_TRUE)) - { - freetext_entry = true; - } -%> - - - - - PDF-AS Amtssignaturen - - - -
-

PDF-AS Amtssignaturen

-
-
Dokument Signatur prüfen
- - -
- -
- -<% - if (freetext_entry) - { -%> -
Vollständiger Dokumenttext:
- -
-<% - } - else - { -%> -
- - - - -<% - } -%> - -
- - - -<%= FormFields.generateConnectorSelectBox() %> - -<% - if (freetext_entry) - { -%> - -
- - - -textuell - -<% - } - else - { -%> - -<% - } -%> - -
-
- - - - - - - -
-
- -
-zurück -
- - \ No newline at end of file -- cgit v1.2.3