- IAIK Libraries (repository) aktualisiert:

	iaik-moa:           Version 1.29
	iaik_jce_full:		Version 4.0_MOA
	iaik_cms:			Version 4.1_MOA
- Einbindung von Online-Vollmachten
- Update MOA-Template zur Bürgerkartenauswahl
- Update Doku
- Update Transformationen (für Online-Vollmachten)
- Änderung der Konfiguration für:
	- Online-Vollmachten		

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1199 d688527b-c9ab-4aba-bd8d-4036d912da1d

5 files changed, 50 insertions, 40 deletions

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index b68d247cb..bb0e11a80 100644
--- a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
+++ b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index e1261b819..ef75dff24 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -29,6 +29,13 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
 	</servlet>
 	<servlet>
+		<servlet-name>GetMISSessionID</servlet-name>
+		<display-name>GetMISSessionID</display-name>
+		<description>Get the MIS session ID coming from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
+	</servlet>
+	
+	<servlet>
 		<servlet-name>GetForeignID</servlet-name>
 		<display-name>GetForeignID</display-name>
 		<description>Gets the foreign eID from security layer</description>
@@ -88,11 +95,14 @@
 		<servlet-name>VerifyIdentityLink</servlet-name>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
-		<servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>VerifyCertificate</servlet-name>
 		<url-pattern>/VerifyCertificate</url-pattern>
 	</servlet-mapping>
-	
+	<servlet-mapping>
+		<servlet-name>GetMISSessionID</servlet-name>
+		<url-pattern>/GetMISSessionID</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>GetForeignID</servlet-name>
 		<url-pattern>/GetForeignID</url-pattern>
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 39b715a6e..28fea78e3 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -94,7 +94,7 @@ h2#tabheader, h2#contentheader {
 

 #bkulogin {

 	overflow:hidden;	

-	width:220px;

+	width:220px;	

 }

 

 #bkukarte {

@@ -212,18 +212,6 @@ p {
 	vertical-align: middle;

 }

 

-.infobutton {

-	background-color: #005a00;

-	color: white;

-	font-family: serif;

-	text-decoration: none;

-	padding-top: 2px;

-	padding-right: 4px;

-	padding-bottom: 2px;

-	padding-left: 4px;

-	font-weight: bold;

-}

-

 /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */

 .hell {

 	background-color : #DDDDDD;	

diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 06639c7e5..4661eea70 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -28,9 +28,6 @@
 					i = url.indexOf(follower);

 					url = url.substring(0, i-1);

 				}

-			

-				

-				// alert (name + ": " + url);

 				

 				return url;

 				

@@ -42,7 +39,7 @@
 

 		<form method="POST" name="moaidform">

 			<input type="hidden" name="Template">

-            <input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">		

+            <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">		

             <input type="hidden" name="useMandate">

     	</form>		

 		

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 0e12035e9..51bcc7156 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -12,25 +12,30 @@
 			

 			// [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 = "[MOA_ID_STARTAUTHENTICATION]";

+			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=sss&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";

 			

 			// [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 = "[URL_TO_LOKALBKU_TEMPLATE]";

+			var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";

 			

 			// [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 = "[URL_TO_ONLINEBKU_TEMPLATE]";

+			var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";

 			

 			// [MUSS] Geben Sie hier die URL zur Online BKU an

 			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"

-			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";

-			

+			//var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";

+			//var URL_TO_ONLINEBKU = "http://localhost:8082/bkuonline/http-security-layer-request";

+			var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";

+

 			// [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 = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";

+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";

+		

 			window.onload=function() {

 				document.getElementById("localBKU").style.display="none";

 				

@@ -45,23 +50,23 @@
 				// set values for local BKU

 				document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;

 				document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;

-				if (document.getElementById("mandateCheckBox").checked) {

-					document.getElementById("useMandate").value = "true";

-				}

-				else {

-					document.getElementById("useMandate").value = "false";

+				document.getElementById("useMandate").value = "false";

+				var checkbox = document.getElementById("mandateCheckBox")

+				if (checkbox !=  null) {

+					if (document.getElementById("mandateCheckBox").checked) {

+						document.getElementById("useMandate").value = "true";

+					}

 				}

-

+				

 				// set values for online BKU

 		        var el = document.getElementById("bkulogin");

         		var parent = el.parentNode;

 				

-				var checkBox = document.getElementById("mandateCheckBox");				

 				var iFrameURL = "iframeOnlineBKU.html" + "?";

 				iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";

 				iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";

 				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";

-				iFrameURL += "useMandate=" + checkBox.checked ;

+				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;

 			

 		 		var iframe = document.createElement("iframe");

 		        iframe.setAttribute("src", iFrameURL);

@@ -78,17 +83,24 @@
         	function bkuHandyClicked() {

 	        	document.getElementById("localBKU").style.display="none";

     	    	

+				document.getElementById("useMandate").value = "false";

+				var checkbox = document.getElementById("mandateCheckBox")

+				if (checkbox !=  null) {

+					if (document.getElementById("mandateCheckBox").checked) {

+						document.getElementById("useMandate").value = "true";

+					}

+				}

+				

 				// set values for Handy Signatur

 		        var el = document.getElementById("bkulogin");

 	    	    var parent = el.parentNode;

 

-				var checkBox = document.getElementById("mandateCheckBox");				

+				

 				var iFrameURL = "iframeHandyBKU.html" + "?";

 				iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";

 				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";

-				iFrameURL += "useMandate=" + checkBox.checked ;

+				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;

 

-		         

 	        	var iframe = document.createElement("iframe");

 		        iframe.setAttribute("src", iFrameURL);

 	    	    iframe.setAttribute("width", "220"); 

@@ -136,9 +148,12 @@
                         <div id="bkuhandy" class="hell">

                             <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>

                         </div> 

-                        <div id="mandate">

-                    		<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>

+                        

+                        <!-- [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>

                         </div>

+

                     </div>