diff options
| author | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2012-02-20 09:36:05 +0000 |
|---|---|---|
| committer | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2012-02-20 09:36:05 +0000 |
| commit | fb449b592d265d880b5f44dd619748fdfe0e734f (patch) | |
| tree | 045bfde28b55d213fe369272bb2291194e28dce1 | |
| parent | df00ecea150a95935b6a4b7cdf8767b4359b55c9 (diff) | |
| download | moa-id-spss-fb449b592d265d880b5f44dd619748fdfe0e734f.tar.gz moa-id-spss-fb449b592d265d880b5f44dd619748fdfe0e734f.tar.bz2 moa-id-spss-fb449b592d265d880b5f44dd619748fdfe0e734f.zip | |
Minor updates for 1.5.1 release
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1265 d688527b-c9ab-4aba-bd8d-4036d912da1d
53 files changed, 313 insertions, 268 deletions
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java b/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java index fae91d035..206245a68 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java @@ -34,7 +34,11 @@ import java.io.PrintWriter; * @version $Id$ */ public class XPathException extends RuntimeException { - /** The wrapped exception. */ + /** + * + */ + private static final long serialVersionUID = 1736311265333034392L; +/** The wrapped exception. */ private Throwable wrapped; /** diff --git a/id/history.txt b/id/history.txt index b8122f762..68b326ff6 100644 --- a/id/history.txt +++ b/id/history.txt @@ -14,10 +14,9 @@ Version MOA-ID 1.5.1: Änderungen seit Version MOA-ID 1.5.0: - für Online-Vollmachten
- Fixer Target-Parameter für Online-Applikation konfigurierbar
- Optionaler Parameter zur Angabe der IssueInstant im UTC Format in der SAML-Assertion
-- Weiterer optionaler Parameter sourceID beim MOA-ID Aufruf
- Update der Standard Trustprofile
- Libraries aktualisiert:
- iaik-moa: Version 1.31
+ iaik-moa: Version 1.32
iaik-ixsil: Version 1.2.2.5
Axis: Version 1.0_IAIK
=====
diff --git a/id/readme_1.5.1.txt b/id/readme_1.5.1.txt index dc7df1837..457391aec 100644 --- a/id/readme_1.5.1.txt +++ b/id/readme_1.5.1.txt @@ -18,10 +18,9 @@ gleichen Verzeichnis): - für Online-Vollmachten
- Fixer Target-Parameter für Online-Applikation konfigurierbar
- Optionaler Parameter zur Angabe der IssueInstant im UTC Format in der SAML-Assertion
-- Weiterer optionaler Parameter sourceID beim MOA-ID Aufruf
- Update der Standard Trustprofile
- Libraries aktualisiert:
- iaik-moa: Version 1.31
+ iaik-moa: Version 1.32
iaik-ixsil: Version 1.2.2.5
Axis: Version 1.0_IAIK
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html index a7e541b85..0f6e1e282 100644 --- a/id/server/auth/src/main/webapp/iframeHandyBKU.html +++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html @@ -8,13 +8,11 @@ <script type="text/javascript">
// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
- // var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
- var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
- //var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
- var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";
+ var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
window.onload=function() {
@@ -47,17 +45,13 @@ </script>
</head>
- <body>
-
- Bitte warten...
-
- <FORM name="moaidform" method="post" id="moaidform">
+ <body>
+ Bitte warten...
+ <form name="moaidform" method="post" id="moaidform">
<input type="hidden" name="Template" id="Template">
<input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">
<input type="hidden" name="useMandate" id="useMandate">
- </FORM>
-
-
+ </form>
<hr>
</body>
</html>
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html index bb69bb5d6..a039005e0 100644 --- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html +++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html @@ -8,20 +8,16 @@ <script type="text/javascript">
// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
- // var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
- var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&sourceID=ABC123-_ABC123";
- //var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
- //var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
- var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";
-
+ var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+
// [MUSS] Geben Sie hier die URL zur Online BKU an
// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
// Hinweis: Diese URL muss auch bei den vertrauenswürdigen BKUs in der MOA-ID Konfiguration angegeben werden (siehe Element MOA-IDConfiguration/TrustedBKUs/BKUURL)
- //var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
- var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";
+ var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
window.onload=function() {
document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
@@ -52,14 +48,12 @@ </script>
</head>
<body>
- Bitte warten...
-
+ Bitte warten...
<form method="POST" name="moaidform" id="moaidform">
<input type="hidden" name="Template" id="Template">
<input type="hidden" name="bkuURI" id="bkuURI">
<input type="hidden" name="useMandate" id="useMandate">
- </form>
-
+ </form>
<hr>
</body>
</html>
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index d78f01f2a..533f2830a 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -11,13 +11,11 @@ <script type="text/javascript">
// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
- // var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
- var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
// z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
- //var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
- var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
+ var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
window.onload=function() {
@@ -97,15 +95,9 @@ <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
<div id="bannerleft">
<h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>
- <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
- <noscript>
- <p>
- Bitte aktivieren Sie JavaScript.
- </p>
- </noscript>
- </div>
+ </div>
<!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
- <div id="bannerright">
+ <div id="bannerright">
<img src="img/logo.jpg" alt="Logo">
</div>
</div>
@@ -115,21 +107,70 @@ Login mit Bürgerkarte
</h2>
<div id="bkulogin" class="hell">
- <!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie das folgende div (bkukarte) aus -->
- <div id="bkukarte" class="hell">
- <button name="bkuButton" type="button" onClick="bkuOnlineClicked();">KARTE</button>
- </div>
- <!-- [OPTIONAL] Um die Mobile BKU auszublenden, kommentieren sie das folgende div (bkukhandy) aus -->
- <div id="bkuhandy" class="hell">
- <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
- </div>
+ <!-- No-Script Variante, wenn im Browser JavaScript deaktiviert ist -->
+ <!-- Defaulteinstellung: No-Script Variante mit Anmeldung via lokaler BKU oder Handysignatur ohne Vollmacht -->
+ <noscript>
+ Kein JavaScript aktiviert!
+
+ <!-- [OPTIONAL] kommentieren sie folgende entsprechenden Blöcke aus, wenn Sie keine No-Script Variante anbieten möchten oder nur bestimmte BKU/Vollmachten Varianten anzeigen möchten -->
+
+ <!-- Block "KARTE": Anmeldung mit lokaler BKU *ohne* Vollmacht (No-Script Variante) -->
+ <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
+ <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false -->
+ <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">
+ <div id="bkukarte" class="hell">
+ <button name="bkuButton" type="button">KARTE</button>
+ </div>
+ </a>
+
+ <!-- Block "KARTE+Vollmacht": Anmeldung mit lokaler BKU *mit* Vollmacht (No-Script Variante) -->
+ <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
+ <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true -->
+ <!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">
+ <div id="bkukarte" class="hell">
+ <button name="bkuButton" type="button">KARTE+<br>Vollmacht</button>
+ </div>
+ </a> -->
+
+
+ <!-- Block "HANDY": Anmeldung mit Handysignatur *ohne* Vollmacht (No-Script Variante) -->
+ <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
+ <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false -->
+ <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">
+ <div id="bkuhandy" class="hell">
+ <button name="bkuButton" type="button">HANDY</button>
+ </div>
+ </a>
- <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie das folgende div (mandate) aus -->
- <div id="mandate">
- <input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox">
- <label>in Vertretung anmelden</label>
- <a href="info_mandates.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
- </div>
+ <!-- Block "HANDY+Vollnacht": Anmeldung mit Handysignatur *mit* Vollmacht (No-Script Variante) -->
+ <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
+ <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true -->
+ <!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">
+ <div id="bkuhandy" class="hell">
+ <button name="bkuButton" type="button">HANDY</button>
+ </div>
+ </a> -->
+
+ </noscript>
+
+ <script>
+ <!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
+ document.write("<div id=\"bkukarte\" class=\"hell\">");
+ document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuOnlineClicked();\">KARTE</button>");
+ document.write("</div>");
+
+ <!-- [OPTIONAL] Um die Handysignatur auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
+ document.write("<div id=\"bkuhandy\" class=\"hell\">");
+ document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuHandyClicked();\">HANDY</button>");
+ document.write("</div>");
+
+ <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie folgende fünf Zeilen aus -->
+ document.write("<div id=\"mandate\">");
+ document.write("<input type=\"checkbox\" name=\"Mandate\" style=\"vertical-align: middle; margin-right: 5px;\" id=\"mandateCheckBox\">");
+ document.write("<label>in Vertretung anmelden</label>");
+ document.write(" <a href=\"info_mandates.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");
+ document.write("</div> ");
+ </script>
</div>
@@ -137,14 +178,10 @@ <div id="localBKU" style="display:none" class="hell">
<hr>
- <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
- <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
<form method="post" id="moaidform">
<input type="hidden" name="show" value="false">
- <!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
- <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
<input type="hidden" name="Template" id="Template">
- <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request">
+ <input type="hidden" name="bkuURI" value="https://127.0.0.1:3496/https-security-layer-request">
<input type="hidden" name="useMandate" id="useMandate">
<input type="submit" size="400" value="Lokale BKU" class="sendButton">
</form>
@@ -160,9 +197,11 @@ <div id="navlist" class="hell">
<ul>
<li>
- <a href="http://www.buergerkarte.at" target="_blank">Bürgerkarte.at</a> </li>
+ <a href="http://www.buergerkarte.at" target="_blank">Bürgerkarte.at</a>
+ </li>
<li>
- <a href="http://www.digitales.oesterreich.gv.at/" target="_blank">Digitales Österreich</a> </li>
+ <a href="http://www.digitales.oesterreich.gv.at/" target="_blank">Digitales Österreich</a>
+ </li>
<li>
<a href="http://www.a-sit.at/" target="_blank">A-SIT</a>
</li>
@@ -178,10 +217,7 @@ <div id="rightcontent">
<p>
- <a href="http://www.buergerkarte.at/de/aktivieren/online.html" target="_blank"><img src="img/ecard_aktivieren.jpg" border="0" alt="eCard online aktivieren" width="210"></a>
- </p>
- <p>
- <a href="http://www.buergerkarte.at/de/aktivieren/mobil.html" target="_blank"><img src="img/mobilsig_aktivieren.jpg" border="0" alt="Mobile Signatur aktivieren" width="210"></a>
+ <a href="http://www.buergerkarte.at/aktivieren.de.php" target="_blank"><img src="img/bk_aktivieren.jpg" border="0" alt="B6uuml;rgerkarte aktivieren" width="210"></a>
</p>
</div>
diff --git a/id/server/auth/src/main/webapp/info_bk.html b/id/server/auth/src/main/webapp/info_bk.html index f15501a80..59aea64cb 100644 --- a/id/server/auth/src/main/webapp/info_bk.html +++ b/id/server/auth/src/main/webapp/info_bk.html @@ -42,38 +42,42 @@ </p>
<ul>
<li>
- eine Chipkarte, die für die Verwendung als Bürgerkarte geeignet ist, wie zum Beispiel Ihre e-card, Bankomatkarte oder Signaturkarte von a-trust oder ein Mobiltelefon, das zur Nutzung als Handy BKU (Bürgerkartenumgebung) registriert ist.
- </li>
+ eine Chipkarte, die für die Verwendung als Bürgerkarte geeignet ist, wie zum Beispiel Ihre e-card, Bankomatkarte oder Signaturkarte von A-Trust
+ </li>
<li>
einen Kartenleser mit den dazugehörigen Treibern
</li>
<li>
eine Bürgerkartensoftware (BKU)
</li>
+ </ul>
+ <p> </p>
+ <p>oder</p>
+ <ul>
+ <li>
+ ein Mobiltelefon, das zur Nutzung als Handysignatur registriert ist.
+ </li>
</ul>
- <p>
- Als Bürgerkartensoftware stehen folgende drei Varianten zur Verfügung:
- </p>
+<p>
+ </p>
+<p>Als Bürgerkartensoftware stehen Ihnen folgende drei Varianten zur Verfügung:
+ </p>
<ul>
- <li><i>Lokale BKU</i>: Diese Software wird lokal auf Ihrem Computer installiert. Die Software finden sie unter <a href="http://www.buergerkarte.at/de/voraussetzungen/software.html" target="_blank">http://www.buergerkarte.at/de/voraussetzungen/software.html</a>
+ <li><i>Lokale BKU</i>: Diese Software wird lokal auf Ihrem Computer installiert. Die Software finden sie unter <a href="http://www.buergerkarte.at/download.de.php" target="_blank">http://www.buergerkarte.at/download.de.php</a>
</li>
- <li><i>Online-BKU</i>: Mit der Online-BKU wird keine lokale Bürgerkartensoftware am PC benötigt. Über JAVA Technologien werden die benötigten Funktionen als Applet im Browser ausgeführt. Einzige Voraussetzung ist eine aktuelle JAVA Version (ab Java 6).
+ <li><i>Online BKU</i>: Mit der Online BKU wird keine lokale Bürgerkartensoftware am PC benötigt. Über JAVA Technologien werden die benötigten Funktionen als Applet im Browser ausgeführt. Einzige Voraussetzung ist eine aktuelle JAVA Version (ab Java 6).
+ </li>
+ <li><i>Handysignatur</i>: Mit der Handysignatur können Sie sich mittels ihres Mobiltelefons anmelden. Voraussetzung ist eine vorherige Registrierung. Mehr Informationen hierzu finden Sie auf: <a href="https://www.handy-signatur.at/" target="_blank">https://www.handy-signatur.at/</a><br>
+ <br>
+ <b>Informationen zur Bürgerkarte finden Sie hier:</b>
</li>
- <li><i>Mobile BKU</i>: Mit der mobilen BKU können sie mittels ihres Mobiltelefons. Voraussetzung ist eine vorherige Registrierung. Mehr Informationen hierzu finden Sie auf <a href="http://www.a-trust.at/mobile/" target="_blank">http://www.a-trust.at/mobile/</a><br>
- <b>Hinweis:</b><br>
- Wenn das JAVA-Applet nicht funktioniert (bei einer älteren JAVA Version als Java 6 oder bei einem nicht unterstützten Browser), müssen Sie die lokale BKU installieren und dann über die Button "Login mit Bürgerkarte" und "Lokale BKU" einsteigen.
- </li>
</ul>
- <p>
- <br>
- <b>Informationen zur Bürgerkarte finden Sie hier:</b>
- </p>
<ul>
- <li>
+ <li>
<a href="http://www.digitales.oesterreich.gv.at" target="_blank">Digitales Österreich</a>: Informationen rund um E-Government
</li>
<li>
- <a href="http://www.buergerkarte.at" target="_blank">Bürgerkarte</a>: Einfach verständliche Informationen zur Bürgerkarte
+ <a href="http://www.buergerkarte.at" target="_blank">Bürgerkarte</a>: Informationen zur Bürgerkarte
</li>
</ul>
<p>
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html index 6ccd295b2..0ad73a6f3 100644 --- a/id/server/auth/src/main/webapp/template_handyBKU.html +++ b/id/server/auth/src/main/webapp/template_handyBKU.html @@ -10,9 +10,10 @@ }
</script>
</head>
- <body onLoad="onAnmeldeSubmit()">
- <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
- <input class="button" type="hidden" value="Starte Authentisierung" name="Senden">
+ <body onLoad="onAnmeldeSubmit()">
+ <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+ Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
+ <input class="button" type="submit" value="Starte Anmeldung" name="Senden">
<input type="hidden" name="XMLRequest" value="<XMLRequest>">
<input type="hidden" name="DataURL" value="<DataURL>">
<input type="hidden" name="PushInfobox" value="<PushInfobox>">
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html index e07ba5d52..f197d2c5c 100644 --- a/id/server/auth/src/main/webapp/template_localBKU.html +++ b/id/server/auth/src/main/webapp/template_localBKU.html @@ -10,9 +10,10 @@ }
</script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body onLoad="onAnmeldeSubmit()">
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
- <input class="button" type="submit" value="Starte Authentisierung" name="Senden">
+ Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
+ <input class="button" type="submit" value="Starte Anmeldung" name="Senden">
<input type="hidden" name="XMLRequest" value="<XMLRequest>">
<input type="hidden" name="DataURL" value="<DataURL>">
<input type="hidden" name="PushInfobox" value="<PushInfobox>">
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html index 1bb2ac236..565955538 100644 --- a/id/server/auth/src/main/webapp/template_onlineBKU.html +++ b/id/server/auth/src/main/webapp/template_onlineBKU.html @@ -10,9 +10,10 @@ }
</script>
</head>
- <body onLoad="onAnmeldeSubmit()">
+ <body onLoad="onAnmeldeSubmit()">
<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
- <input class="button" type="hidden" value="Starte Authentisierung" name="Senden">
+ Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
+ <input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
<input type="hidden" name="XMLRequest" value="<XMLRequest>">
<input type="hidden" name="DataURL" value="<DataURL>">
<input type="hidden" name="PushInfobox" value="<PushInfobox>">
diff --git a/id/server/doc/moa_id/id-anwendung_1.htm b/id/server/doc/moa_id/id-anwendung_1.htm index 561f3f556..dfc0ecd32 100644 --- a/id/server/doc/moa_id/id-anwendung_1.htm +++ b/id/server/doc/moa_id/id-anwendung_1.htm @@ -92,10 +92,10 @@ StartAuthentication?Target=<geschäftsbereich> <td id="klein">useMandate=<true/false></td> <td id="klein">optional; Gibt an ob eine Anmeldung im Online-Vollmachten-Modus durchgeführt werden soll (=true) oder nicht (=false);</td> </tr> -<tr> +<!--<tr> <td id="klein2">sourceID=<sourceID></td> <td id="klein2">optional; Gibt eine sourceID an, die (wenn sie gesetzt ist) zur Berechnung des SAML-Artifacts herangezogen wird.</td> -</tr> +</tr>--> </tbody> </table> <br/><br/> diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java index a8d30a22f..ae4c5fd1e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java @@ -34,6 +34,10 @@ package at.gv.egovernment.moa.id; public class AuthenticationException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = 263160314137775182L; +/** * Constructor for AuthenticationException. * @param messageId */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java index 298b9b9cc..c2ef9be6f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java @@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id; public class BuildException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = 5485716047459933845L; + +/** * Constructor for BuildException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java index 13f5f9863..c7c9e3d07 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java @@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id; public class ECDSAConverterException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = 4410043097831285005L; + +/** * Constructor for ECDSAConverterException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java index f86e37972..54b5351de 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java @@ -48,7 +48,11 @@ import at.gv.egovernment.moa.util.Constants; * @version $Id$ */ public class MOAIDException extends Exception { - /** message ID */ + /** + * + */ + private static final long serialVersionUID = -1507246171708083912L; +/** message ID */ private String messageId; /** wrapped exception */ private Throwable wrapped; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java index 999b64c10..eac65d14f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java @@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id; public class ParseException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -1057863353991948754L; + +/** * Constructor for ParseException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java index de56d63a9..8ba23705e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java @@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id; public class ServiceException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = 30082718911952186L; + +/** * Constructor for ServiceException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index bf35b31f2..49d421f8e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -24,15 +24,11 @@ package at.gv.egovernment.moa.id.auth; -import iaik.ixsil.exceptions.UtilsException; -import iaik.ixsil.util.Utils; import iaik.pki.PKIException; import iaik.x509.X509Certificate; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.security.GeneralSecurityException; import java.security.Principal; @@ -530,10 +526,8 @@ public class AuthenticationServer implements MOAIDAuthConstants { // System.out.println(xmlInfoboxReadResponse); // // } catch (FileNotFoundException e) { -// // TODO Auto-generated catch block // e.printStackTrace(); // } catch (UtilsException e) { -// // TODO Auto-generated catch block // e.printStackTrace(); // } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java index 8f1d7cbf8..d98c944de 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java @@ -36,6 +36,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class WrongParametersException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -7501748998171109466L; + +/** * Constructor */ public WrongParametersException(String call, String parameter, String errorID) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java index bde0be4a1..a19618dc2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java @@ -62,6 +62,11 @@ public class AuthServlet extends HttpServlet implements MOAIDAuthConstants { /** + * + */ + private static final long serialVersionUID = -6929905344382283738L; + +/** * Handles an error. <br>> * <ul> * <li>Logs the error</li> diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java index cb3857ee0..a77224d10 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java @@ -50,6 +50,11 @@ import at.gv.egovernment.moa.logging.Logger; public class ConfigurationServlet extends HttpServlet { /** + * + */ + private static final long serialVersionUID = 7455620886605337681L; + +/** * Handle a HTTP GET request, used to indicated that the MOA * configuration needs to be updated (reloaded). * diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java index c135cd3c7..246a47699 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java @@ -69,7 +69,12 @@ import at.gv.egovernment.moa.util.URLEncoder; */
public class GetForeignIDServlet extends AuthServlet {
- /**
+ /** + * + */ + private static final long serialVersionUID = -3415644214702379483L; + +/**
* Constructor for GetForeignIDServlet.
*/
public GetForeignIDServlet() {
@@ -171,7 +176,6 @@ public class GetForeignIDServlet extends AuthServlet { // try {
// System.out.println(DOMUtils.serializeNode(samlAssertion));
// } catch (TransformerException e) {
-// // TODO Auto-generated catch block
// e.printStackTrace();
// }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index 977784a6b..9d26ded8a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -65,7 +65,12 @@ import at.gv.egovernment.moa.util.URLEncoder; */
public class GetMISSessionIDServlet extends AuthServlet {
- /**
+ /** + * + */ + private static final long serialVersionUID = 4666952867085392597L; + +/**
* Constructor for GetMISSessionIDServlet.
*/
public GetMISSessionIDServlet() {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java index dd8a3144a..d544e2f85 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java @@ -61,6 +61,11 @@ import at.gv.egovernment.moa.util.StringUtils; public class SelectBKUServlet extends AuthServlet { /** + * + */ + private static final long serialVersionUID = 4764993494204751296L; + +/** * Calls the web application initializer. * * @see javax.servlet.Servlet#init(ServletConfig) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java index 431af3c31..355e85ce5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java @@ -57,6 +57,12 @@ import at.gv.egovernment.moa.util.StringUtils; public class StartAuthenticationServlet extends AuthServlet { /** + * + */ + private static final long serialVersionUID = 3908001651893673395L; + + +/** * Responds with an HTML form which upon submit requests the identity link * from the security layer implementation. * <br> diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java index a51fa483f..f15f839d7 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java @@ -72,6 +72,11 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet { /** + * + */ + private static final long serialVersionUID = -2409629495345900542L; + +/** * Constructor for VerifyAuthenticationBlockServlet. */ public VerifyAuthenticationBlockServlet() { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index 27f956c40..acd96dee0 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -24,22 +24,17 @@ package at.gv.egovernment.moa.id.auth.servlet;
-import iaik.pki.PKIException; import iaik.x509.X509Certificate; import java.io.IOException; -import java.security.GeneralSecurityException; import java.util.Map; -import javax.net.ssl.SSLSocketFactory; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.TransformerException; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.lang.StringEscapeUtils; -import org.w3c.dom.Element; import at.gv.egovernment.moa.id.AuthenticationException; import at.gv.egovernment.moa.id.MOAIDException; @@ -48,17 +43,9 @@ import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.WrongParametersException; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.config.ConnectionParameter; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.SSLUtils; import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException; import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.DOMUtils; /**
* Servlet requested for getting the foreign eID
@@ -68,7 +55,12 @@ import at.gv.egovernment.moa.util.DOMUtils; */
public class VerifyCertificateServlet extends AuthServlet {
- /**
+ /** + * + */ + private static final long serialVersionUID = -4110159749768152538L; + +/**
* Constructor for VerifyCertificateServlet.
*/
public VerifyCertificateServlet() {
@@ -171,106 +163,7 @@ public class VerifyCertificateServlet extends AuthServlet { catch (MOAIDException ex) {
handleError(null, ex, req, resp);
}
- }
-
- /**
- * Does the request to the SZR-GW
- * @param givenname
- * @param familyname
- * @param dateofbirth
- * @return Identity link assertion
- * @throws SZRGWClientException
- */
- /*private Element getIdentityLink(Element signature) throws SZRGWClientException {*/
-// private Element getIdentityLink(X509Certificate cert) throws SZRGWClientException {
-//
-// SZRGWClient client = new SZRGWClient();
-//
-// try {
-// AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-// ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
-// //url = "http://localhost:8081/szr-gateway/services/IdentityLinkCreation";
-// Logger.debug("Connection Parameters: " + connectionParameters);
-// client.setAddress(connectionParameters.getUrl());
-// if (connectionParameters.getUrl().toLowerCase().startsWith("https:")) {
-// Logger.debug("Initialisiere SSL Verbindung");
-// try {
-// client.setSSLSocketFactory(SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters));
-// } catch (IOException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// } catch (GeneralSecurityException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// } catch (PKIException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
-//
-// Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
-//
-//
-// }
-// catch (ConfigurationException e) {
-// Logger.warn(e);
-// Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
-//
-// }
-// // create request
-// Document doc = buildGetIdentityLinkRequest(cert);
-// Element request = doc.getDocumentElement();
-// CreateIdentityLinkResponse response = null;
-//
-// //try {
-// response = client.createIdentityLinkResponse(request);
-// //} catch (SZRGWClientException e) {
-// // give him a second try - Nach dem Starten des Tomcat wird beim ersten Mal das Client-Zertifikat offenbar vom HTTPClient nicht mitgeschickt.
-// // client = new SZRGWClient(url);
-// // response = client.createIdentityLinkResponse(request);
-// // }
-//
-//
-// return response.getAssertion();
-//
-// }
-
-// /**
-// * Builds the szrgw:GetIdentityLinkRequest für the SZR-GW
-// * @param givenname
-// * @param familyname
-// * @param birthday
-// * @return
-// */
-// private static Document buildGetIdentityLinkRequest(X509Certificate cert) {
-//
-// try {
-// byte[] certbyte = cert.getEncoded();
-// String certstring = Base64.encode(certbyte);
-//
-// DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();
-// factory.setNamespaceAware(true);
-// DocumentBuilder builder = factory.newDocumentBuilder();
-// Document doc = builder.newDocument();
-//
-// Element getIdentityLink = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:GetIdentityLinkRequest");
-// getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGWConstants.SZRGW_REQUEST_NS);
-// doc.appendChild(getIdentityLink);
-//
-// Element x509certificate = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:X509Certificate");
-// getIdentityLink.appendChild(x509certificate);
-// Text certbase64 = doc.createTextNode(certstring);
-// x509certificate.appendChild(certbase64);
-//
-// return doc;
-// } catch (ParserConfigurationException e) {
-// e.printStackTrace();
-// } catch (CertificateEncodingException e) {
-// e.printStackTrace();
-// }
-// return null;
-//
-// }
-//
+ }
+
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java index fc5d82936..17f7deb9b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java @@ -58,6 +58,11 @@ import at.gv.egovernment.moa.logging.Logger; public class VerifyIdentityLinkServlet extends AuthServlet { /** + * + */ + private static final long serialVersionUID = -7074476974026049958L; + +/** * Constructor for VerifyIdentityLinkServlet. */ public VerifyIdentityLinkServlet() { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java index 65f59a53b..7ac3a15dd 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java @@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class ValidateException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -3784899738402848497L; + +/** * Constructor for ValidateException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java index 1e35b1f67..5eeaa5d3d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java @@ -113,7 +113,6 @@ public class ParepUtils { }
}
- // TODO: remove unreferenced
/**
* Dumps all bytes from an input stream to the given output stream.
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java index 7070597fc..7bd6f5e28 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java @@ -331,7 +331,6 @@ public class ParepValidator implements InfoboxValidator { this.form = "";
try {
- // TODO: Frage ob OID im Zertifikat zu prüfen ist (macht derzeit das SZR-gateway). Dies würde aber zu eine Performanceeinbuße führen.
request.setSignature(samlAssertion);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java index 25a31c65e..49198d79f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java @@ -31,7 +31,12 @@ package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw; */ public class SZRGWClientException extends Exception { - /* + /** + * + */ + private static final long serialVersionUID = 26538259471017714L; + +/* * see super constructor. */ public SZRGWClientException() { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java index cee9397d0..b0525978d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java @@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class ConfigurationException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -7199539463319751278L; + +/** * Create a <code>MOAConfigurationException</code>. */ public ConfigurationException(String messageId, Object[] parameters) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java index 89999ce76..7a356aaf0 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java @@ -42,12 +42,7 @@ import at.gv.egovernment.moa.util.URLEncoder; */ public class DefaultLoginParameterResolver implements LoginParameterResolver { - /** - * Constructor - */ - //public DefaultLoginParameterResolver() { - //} - //@TODO: Änderung von 1.4.4 + /** * Configuration mehtod (not used) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java index dd5d43e06..29c8b3bca 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java @@ -168,7 +168,6 @@ public class ElakConnectionBuilder implements ConnectionBuilder { } catch (ClassNotFoundException e) { - // TODO Auto-generated catch block e.printStackTrace(); } URLStreamHandler urlStreamHandler = null; @@ -178,12 +177,10 @@ public class ElakConnectionBuilder implements ConnectionBuilder { } catch (InstantiationException e1) { - // TODO Auto-generated catch block e1.printStackTrace(); } catch (IllegalAccessException e1) { - // TODO Auto-generated catch block e1.printStackTrace(); } //URL testURL = new URL("http", realURLString.substring("http://localhost:82".length()), 82, "", urlStreamHandler); @@ -266,7 +263,6 @@ public class ElakConnectionBuilder implements ConnectionBuilder { public boolean verify(String hostname, SSLSession session) { - // TODO Auto-generated method stub return true; } /** diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java index b97415c94..191fb51b9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java @@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class LoginParameterResolverException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = 3924645289077681081L; + + /** * Constructor for LoginParameterResolverException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java index 248672bf5..0d435a64f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java @@ -37,6 +37,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class NotAllowedException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -265024674370936886L; + + /** * Constructor for NotAllowedException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java index c4b44f04e..099d663ea 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java @@ -49,6 +49,11 @@ import at.gv.egovernment.moa.logging.Logger; public class ConfigurationServlet extends HttpServlet { /** + * + */ + private static final long serialVersionUID = -886733697373217942L; + +/** * Handle a HTTP GET request, used to indicated that the MOA * configuration needs to be updated (reloaded). * diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java index 45c9c09f8..3a967d8f9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java @@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException; public class ProxyException extends MOAIDException { /** + * + */ + private static final long serialVersionUID = -2498996404868930153L; + +/** * Constructor for ProxyException. * @param messageId * @param parameters diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java index f695319ac..a55e02cdd 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java @@ -80,7 +80,11 @@ import at.gv.egovernment.moa.util.Base64Utils; * @version $Id$ */ public class ProxyServlet extends HttpServlet { - /** Name of the Parameter for the Target */ + /** + * + */ + private static final long serialVersionUID = 6838184868735988125L; +/** Name of the Parameter for the Target */ private static final String PARAM_TARGET = "Target"; /** Name of the Parameter for the SAMLArtifact */ private static final String PARAM_SAMLARTIFACT = "SAMLArtifact"; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java index 9df55724e..790651adf 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java @@ -24,26 +24,25 @@ package at.gv.egovernment.moa.id.util;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils; +import java.io.IOException; +import java.io.StringReader; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.logging.Logger; public class ParamValidatorUtils {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java index 620919c61..fed9cc72b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java @@ -243,10 +243,8 @@ public class MISSimpleClient { // try { // System.out.println("REQUEST-MIS: \n" + DOMUtils.serializeNode(request)); // } catch (TransformerException e1) { -// // TODO Auto-generated catch block // e1.printStackTrace(); // } catch (IOException e1) { -// // TODO Auto-generated catch block // e1.printStackTrace(); // } diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java index 4e83bce9d..6fb533ff0 100644 --- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java +++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java @@ -33,13 +33,9 @@ import java.security.PublicKey; import org.w3c.dom.Document; import test.at.gv.egovernment.moa.id.UnitTestCase; - -import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.util.ECDSAKeyValueConverter; import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser; -import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator; +import at.gv.egovernment.moa.id.util.ECDSAKeyValueConverter; import at.gv.egovernment.moa.util.Constants; import at.gv.egovernment.moa.util.DOMUtils; diff --git a/spss/server/history.txt b/spss/server/history.txt index 3d4e9d9cb..7154bd22f 100644 --- a/spss/server/history.txt +++ b/spss/server/history.txt @@ -8,7 +8,7 @@ - Update der Standard Trustprofile und Standard Konfigurationen - Standard Trustprofil "OfficialSignature" für Amtssignaturen hinzugefügt - Libraries aktualisiert: - iaik-moa: Version 1.31 + iaik-moa: Version 1.32 iaik-ixsil: Version 1.2.2.5 Axis: Version 1.0_IAIK diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java index 882036077..305c22783 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java @@ -36,6 +36,11 @@ package at.gv.egovernment.moa.spss; public class MOAApplicationException extends MOAException { /** + * + */ + private static final long serialVersionUID = 1042877795934327684L; + +/** * Create a new <code>MOAApplicationException</code>. * * @param messageId The identifier of the message associated with this diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java index f41c2a238..30eed7001 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java @@ -50,7 +50,11 @@ import at.gv.egovernment.moa.spss.util.MessageProvider; * @version $Id$ */ public abstract class MOAException extends Exception { - /** The message ID. */ + /** + * + */ + private static final long serialVersionUID = 7115301799538771949L; +/** The message ID. */ private String messageId; /** The wrapped <code>Throwable</code>. */ private Throwable wrapped; diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java index d392e2681..a3c8565e5 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java @@ -49,7 +49,11 @@ import at.gv.egovernment.moa.util.Constants; * @version $Id$ */ public class MOARuntimeException extends RuntimeException { - /** The message ID. */ + /** + * + */ + private static final long serialVersionUID = 8516197293435621864L; +/** The message ID. */ private String messageId; /** The wrapped <code>Throwable</code>. */ private Throwable wrapped; diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java index 23984deae..67c19082d 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java @@ -35,6 +35,11 @@ package at.gv.egovernment.moa.spss; public class MOASystemException extends MOAException { /** + * + */ + private static final long serialVersionUID = 655642019638205185L; + +/** * Create a new <code>MOASystemException</code>. * * @param messageId The identifier of the message associated with this diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java index 6584a337d..6546e88f1 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java @@ -35,6 +35,11 @@ import at.gv.egovernment.moa.spss.MOASystemException; public class ConfigurationException extends MOASystemException { /** + * + */ + private static final long serialVersionUID = -1934466124930228755L; + +/** * Create a <code>ConfigurationException</code>. * * @see at.gv.egovernment.moa.spss.MOAException#MOAException(String, Object[]) diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java index dd5436827..b4f73b96b 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java @@ -24,13 +24,13 @@ package at.gv.egovernment.moa.spss.server.invoke; +import iaik.IAIKException; +import iaik.IAIKRuntimeException; + import java.lang.reflect.Constructor; import java.util.HashMap; import java.util.Map; -import iaik.IAIKException; -import iaik.IAIKRuntimeException; - import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.MOASystemException; @@ -83,7 +83,7 @@ public class IaikExceptionMapper { { iaik.server.modules.xmlverify.SignerCertificateUnavailableException.class, "2243", MOAApplicationException.class }, { iaik.server.modules.xmlverify.SupplementException.class, "2230", MOAApplicationException.class }, { iaik.server.modules.xmlverify.TransformationException.class, "2265", MOAApplicationException.class }, - { iaik.server.modules.xmlverify.TransformationParsingException.class, "2269", MOAApplicationException.class }, + { iaik.server.modules.xmlverify.TransformationParsingException.class, "2269", MOAApplicationException.class } }; /** The single instance of this class. */ diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java index 8a48cc755..6bf2317b4 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java @@ -71,7 +71,12 @@ import at.gv.egovernment.moa.util.DOMUtils; */ public class AxisHandler extends BasicHandler { - /** The resource names of the messages to load. */ + /** + * + */ + private static final long serialVersionUID = 2520698947819506866L; + +/** The resource names of the messages to load. */ private static final String MOA_SPSS_WSDL_RESOURCE_ = "/resources/wsdl/MOA-SPSS-1.3.wsdl"; /** The property name for accessing the HTTP request. */ diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java index 2e2f0fc72..8bdfb6578 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java @@ -53,7 +53,11 @@ import at.gv.egovernment.moa.spss.util.MessageProvider; * @version $Id$ */ public class ConfigurationServlet extends HttpServlet { - /** The document type of the HTML to generate. */ + /** + * + */ + private static final long serialVersionUID = 8372961105222028696L; +/** The document type of the HTML to generate. */ private static final String DOC_TYPE = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"; diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java index 1bb125c74..d986f7a1b 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java @@ -33,7 +33,6 @@ import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.util.MOASPSSEntityResolver; import at.gv.egovernment.moa.util.Constants; import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.egovernment.moa.util.MOAEntityResolver; import at.gv.egovernment.moa.util.MOAErrorHandler; /** |