Integration of STORK

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

13 files changed, 336 insertions, 45 deletions

diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
index 63fe7cb8a..7ba572a76 100644
--- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Fri Nov 16 13:12:23 CET 2007

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4

@@ -9,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

 org.eclipse.jdt.core.compiler.source=1.4

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index b116cf610..ddba575d7 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<project-modules id="moduleCoreId" project-version="1.5.0">

-<wb-module deploy-name="moa-id-auth">

-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>

-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>

-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-<property name="java-output-path" value="target/classes"/>

-        <property name="context-root" value="moa-id-auth"/>

-</wb-module>

-</project-modules>

+<project-modules id="moduleCoreId" project-version="2.0">

+  <wb-module deploy-name="moa-id-auth">

+    <property name="context-root" value="moa-id-auth"/>

+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

+    <wb-resource deploy-path="/" source-path="src/main/wsdl"/>

+    <property name="java-output-path" value="/target/classes"/>

+    <dependent-module archiveName="axis-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.1/axis-1.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="moa-spss-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_moa-1.32.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="moa-common.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="moa-id-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-fileupload-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-io-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-httpclient-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-codec-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="dav4j-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dav4j/dav4j/0.1/dav4j-0.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="httpsclient-JSSE-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_X509TrustManager-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="regexp-1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/regexp/regexp/1.3/regexp-1.3.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="stork-saml-engine.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="opensaml-2.5.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/opensaml/2.5.3/opensaml-2.5.3.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="openws-1.4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/openws/1.4.4/openws-1.4.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xmltooling-1.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="bcprov-jdk15-1.46.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="not-yet-commons-ssl-0.3.9.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xmlsec-1.4.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xml-apis-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xercesImpl-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="serializer-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xml-resolver-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="xalan-2.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="slf4j-api-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="velocity-1.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/velocity/velocity/1.5/velocity-1.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="esapi-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/owasp/esapi/esapi/2.0.1/esapi-2.0.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="slf4j-log4j12-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>

+  </wb-module>

+</project-modules>
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
index f30a1de6e..a801c94a0 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <faceted-project>

+  <fixed facet="jst.java"/>

+  <fixed facet="jst.web"/>

+  <installed facet="jst.web" version="2.4"/>

   <installed facet="jst.java" version="1.4"/>

-  <installed facet="jst.web" version="2.3"/>

-</faceted-project>

+</faceted-project>
\ No newline at end of file
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 ef75dff24..2a1d093d9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -70,6 +70,13 @@
         <servlet-name>jspservlet</servlet-name>
         <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
     </servlet>
+	<servlet>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
+		<display-name>PEPSConnectorServlet</display-name>
+		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
+		<servlet-class>
+		at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
+	</servlet>
     
 	<!-- servlet mapping for jsp pages -->
 	<!-- errorpage.jsp (customizeable) -->
@@ -124,8 +131,12 @@
 		<servlet-name>AxisServlet</servlet-name>
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
+		<url-pattern>/PEPSConnector</url-pattern>
+	</servlet-mapping>
 	<session-config>
-		<session-timeout>30</session-timeout>
+		<session-timeout>5</session-timeout>
 	</session-config>
 	<error-page>
 		<error-code>500</error-code>
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 18a0dccde..3dd974813 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -124,6 +124,12 @@ button {
 	cursor: pointer;

 }

 

+input {

+	background: #efefef;

+	border:1px solid #000;

+	cursor: pointer;

+}

+

 #installJava, #BrowserNOK {

 	clear:both;

 	font-size:0.8em;

diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 0f6e1e282..b5936679f 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -8,11 +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";

 				

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

 				

 				

 			window.onload=function() {

@@ -49,7 +49,8 @@
 	    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="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx"> -->

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

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

 		</form>		

 		<hr>

diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index a039005e0..7f6efb241 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -8,16 +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";

 			

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

 			

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

 				

 			window.onload=function() {

 				document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;

@@ -30,6 +30,10 @@
 					document.getElementById('useMandate').value = "true";

 				else

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

+

+				var ccc = gup("ccc");

+				if (ccc != null)

+					document.getElementById('ccc').value = ccc;

 				

 				document.moaidform.submit();

       			return;

@@ -53,6 +57,7 @@
 			<input type="hidden" name="Template" id="Template">

             <input type="hidden" name="bkuURI" id="bkuURI">

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

+            <input type="hidden" name="CCC" id="ccc">

     	</form>	

 		<hr>

 	</body>

diff --git a/id/server/auth/src/main/webapp/img/stork-logo.png b/id/server/auth/src/main/webapp/img/stork-logo.png
new file mode 100644
index 000000000..70355a084
--- /dev/null
+++ b/id/server/auth/src/main/webapp/img/stork-logo.png
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 533f2830a..03123c2a7 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -11,11 +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";	

 			

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

 			

 			

 			window.onload=function() {

@@ -38,12 +38,12 @@
 						document.getElementById("useMandate").value = "true";

 					}

 				}

-					

+									

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

         		var parent = el.parentNode;

 

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

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

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

 

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

 		        iframe.setAttribute("src", iFrameURL);

@@ -55,8 +55,7 @@
 

 		        parent.replaceChild(iframe, el);

         	}

-        

-

+        	        

         	function bkuHandyClicked() {

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

 

@@ -84,6 +83,46 @@
 	

 			    parent.replaceChild(iframe, el);

 			}

+	

+        	function storkClicked() {				

+				document.getElementById("localBKU").style.display="block"; 

+				

+				document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;

+				document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;

+				

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

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

+				if (checkbox !=  null) {

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

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

+					}

+				}

+

+				var ccc = "AT";

+				var countrySelection = document.getElementById("cccSelection");

+				

+				if (countrySelection !=  null) {

+					ccc = document.getElementById("cccSelection").value;

+				}

+					

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

+        		var parent = el.parentNode;

+

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

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

+				iFrameURL += "ccc=" + ccc;

+

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

+		        iframe.setAttribute("src", iFrameURL);

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

+		        iframe.setAttribute("height", "165");

+		        iframe.setAttribute("frameborder", "0");

+		        iframe.setAttribute("scrolling", "no");

+		        iframe.setAttribute("title", "Login");

+

+		        parent.replaceChild(iframe, el);

+        	}

+			

         </script>

     </head>

     <body>

@@ -117,16 +156,17 @@
                 	        <!-- 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">					

+			                <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&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>

+                	        </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">					

+		                    <!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&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>

@@ -136,7 +176,7 @@
 							<!-- 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">

+							<a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&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>

@@ -145,14 +185,44 @@
 	                        <!-- 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">

+							<!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&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>

 

+	                    	<!-- Block "Ausländische Identitäten bzw. STORK": Länderauswahl für Anmeldung ausländischer Identitäten über STORK oder lokale BKU(No-Script Variante) -->

+		                    <!-- [MUSS] Geben Sie im Feld "action" die URL zum Aufruf von MOA-ID an (inkl. Template-URL und bkuURI) -->

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

+							<div id="leftcontent" style="margin-bottom:10px">

+		                    	<h2 id="tabheader" class="dunkel">

+    		                    	Home Country Selection                    

+	        		            </h2>

+    	            	    </div>

+        	                <div id="stork" class="hell" align="center"> 

+                           		<p>

+            	                	<form name="storkForm" method="POST" action="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request">

+       	    	                		<select name="CCC" size="1" style="width:120px">

+           		                			<option value="BE">België/Belgique</option>

+											<option value="EE">Eesti</option>

+											<option value="ES">España</option>

+											<option value="IS">Ísland</option>																						

+											<option value="IT">Italia</option>

+											<option value="LI">Liechtenstein</option>

+											<option value="LT">Lithuania</option>

+											<option value="PT">Portugal</option>

+											<option value="SI">Slovenija</option>

+											<option value="FI">Suomi</option>

+											<option value="SE">Sverige</option>													  

+    		                        	</select>

+    		                        	<input type="submit" name="storkButton" value="Send" alt="Send" class="button"/>            		                	

+                	                    <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>

+									</form>

+                                </p>

+							</div>

+							

+                   		</noscript>

                     <script>

 						<!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->

                         document.write("<div id=\"bkukarte\" class=\"hell\">");     

@@ -170,6 +240,33 @@
 								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> ");

+						

+                        <!-- [OPTIONAL] Um die Anmeldung von ausländischen Identitäten auszublenden, kommentieren Sie folgende Zeilen aus -->

+						document.write("<div id=\"leftcontent\" style=\"margin-bottom:10px\">");

+							document.write("<h2 id=\"tabheader\" class=\"dunkel\">");

+								document.write("Home Country Selection");

+							document.write("</h2>");

+						document.write("</div>");

+						document.write("<div id=\"stork\" class=\"hell\" align=\"center\">");

+							document.write("<p>");								

+		   	    	            	document.write("<select name=\"cccSelection\" id=\"cccSelection\" size=\"1\" style=\"width: 120px; margin-right: 5px;\" >");

+        	   		                	document.write("<option value=\"BE\">België/Belgique</option>");    

+				                        document.write("<option value=\"EE\">Eesti</option>");

+    	        	                  	document.write("<option value=\"ES\">España</option>");

+    	        	                  	document.write("<option value=\"IS\">Ísland</option>");    

+				                        document.write("<option value=\"IT\">Italia</option>");

+    	        	                  	document.write("<option value=\"LI\">Liechtenstein</option>");

+    	        	                  	document.write("<option value=\"LT\">Lithuania</option>");    

+				                        document.write("<option value=\"PT\">Portugal</option>");

+    	        	                  	document.write("<option value=\"SI\">Slovenija</option>");

+    	        	                  	document.write("<option value=\"FI\">Suomi</option>");    

+				                        document.write("<option value=\"SE\">Sverige</option>");				                                	        	                  

+	   	            	            document.write("</select>");

+	   	            	         	document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"storkClicked();\">Send</button>");

+									document.write(" <a href=\"info_stork.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");								

+							document.write("</p>");

+						document.write("</div>");

+						

                     </script>

                     </div>

 

@@ -182,7 +279,8 @@
                             <input type="hidden" name="show" value="false"> 

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

                             <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="hidden" name="useMandate" id="useMandate">

+                            <input type="hidden" name="CCC" id="ccc">  

                             <input type="submit" size="400" value="Lokale BKU" class="sendButton">

                         </form>

                         <p>

diff --git a/id/server/auth/src/main/webapp/info_stork.html b/id/server/auth/src/main/webapp/info_stork.html
new file mode 100644
index 000000000..3bd88300c
--- /dev/null
+++ b/id/server/auth/src/main/webapp/info_stork.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

+<html lang="de">

+	<head>

+		<title>Information (STORK)</title>

+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

+        <meta http-equiv="Content-Style-Type" content="text/css">

+        <link rel="stylesheet" type="text/css" href="css/index.css">

+	</head>

+	<body>

+		<div id="wrapper">

+            <p id="skiplinks">

+                <a href="#content">Go to contents</a>

+            </p>

+            <div id="banner">

+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->

+                <div id="bannerleft">

+                    <h1>Information using STORK for secure authentication</h1>

+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->

+                    <noscript>

+                        <p>

+                            Please activate JavaScript.

+                        </p>

+	                </noscript>

+                </div>                

+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->

+                <div id="bannerright">

+                    <img src="img/stork-logo.png" alt="STORK-Logo">

+                </div>

+            </div>

+            <div id="main">

+                <div id="centercontent">

+                    <h2 id="contentheader" class="dunkel">

+                        Information using STORK for secure authentication

+                    </h2>

+                    <div id="content" class="hell">

+                        

+                        <p>The STORK project makes it easier for citizens to access online public services across borders by implementing Europe-wide interoperable cross border platforms for the mutual recognition of national electronic identity (eID) between participating countries.</p>

+                        <p>For more information, please consult the STORK website:</p><a href="https://www.eid-stork.eu/">https://www.eid-stork.eu/</a>

+					</div>

+                </div>

+            </div>

+		</div>

+	</body>

+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index 0ad73a6f3..27834cd91 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -12,7 +12,6 @@
 	</head>

 	<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>">

diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html
index f197d2c5c..64275391a 100644
--- a/id/server/auth/src/main/webapp/template_localBKU.html
+++ b/id/server/auth/src/main/webapp/template_localBKU.html
@@ -11,8 +11,7 @@
 		</script>

 	</head>

 	<body onLoad="onAnmeldeSubmit()">	   

-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">

-			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 

+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">			

      		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">

 			<input type="hidden" name="XMLRequest" value="<XMLRequest>">

 			<input type="hidden" name="DataURL" value="<DataURL>">

diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index 565955538..b8cd19866 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -11,8 +11,7 @@
 		</script>

 	</head>

 	<body onLoad="onAnmeldeSubmit()">	 

-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">

-			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 

+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">			

 		    <input class="button" type="hidden" value="Starte Anmeldung" name="Senden">

 			<input type="hidden" name="XMLRequest" value="<XMLRequest>">

 			<input type="hidden" name="DataURL" value="<DataURL>">