MOA-ID 1.1.1D01

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

3 files changed, 92 insertions, 22 deletions

diff --git a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml b/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
index 6ce00228c..26898f754 100644
--- a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
+++ b/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
@@ -1,54 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
 <MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
+	<!-- fuer MOA-ID-AUTH -->
 	<AuthComponent>
-		<BKUSelection>
-			<ConnectionParameter URL="http://10.16.46.108:18080/oa/getBKUSelectTag.jsp"/>
+		<!-- URL und akzeptierte TLS-Server-Zertifikate des verwendeten BKU-Auswahl Service -->
+		<BKUSelection BKUSelectionAlternative="HTMLComplete">
+			<ConnectionParameter URL="http://auswahl.buergerkarte.at/auswahl">
+			<!-- 	<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates> -->
+			</ConnectionParameter>
 		</BKUSelection>
+		<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
 		<SecurityLayer>
-			<TransformsInfo filename="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/Transforms/TransformsInfosHTML.xml"/>
+			<TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/>
 		</SecurityLayer>
 		<MOA-SP>
-			<ConnectionParameter URL="https://10.16.46.108:8443/moa-spss/services/SignatureVerification">
-				<AcceptedServerCertificates>file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/certs/server-certs</AcceptedServerCertificates>
-				<ClientKeyStore password="Keystore Pass">file:/c:/</ClientKeyStore>
-			</ConnectionParameter>
+			<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird. Wenn MOA-SP direkt ueber API aufgerufen werden soll, so wird das Element auskommentiert 			
+			<ConnectionParameter URL="http://localhost:8080/moa-spss/services/SignatureVerification"> -->
+			<!--	<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates> -->
+			<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			<!-- </ConnectionParameter> -->
+			<!-- TrustProfile fuer den IdentityLink der Buergerkarte; muss in MOA-SP konfiguriert sein -->
 			<VerifyIdentityLink>
-				<TrustProfileID>TrustProfile1</TrustProfileID>
+				<TrustProfileID>MOAIDBuergerkartePersonenbindung</TrustProfileID>
 			</VerifyIdentityLink>
 			<VerifyAuthBlock>
-				<TrustProfileID>TrustProfile1</TrustProfileID>
-				<VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
+				<!-- TrustProfile fuer die Signatur des AUTH-Blocks der Buergerkarte; muss in MOA-SP konfiguriert sein -->
+				<TrustProfileID>MOAIDBuergerkarteAuthentisierungsDaten</TrustProfileID>
+				<!-- VerifyTransformsInfoProfile mit den Transformationen fuer die Anzeige der Anmeldedaten im Secure Viewer; muss in MOA-SP konfiguriert sein -->
+				<VerifyTransformsInfoProfileID>MOAIDTransformAuthBlock</VerifyTransformsInfoProfileID>
 			</VerifyAuthBlock>
 		</MOA-SP>
+		<!-- Gueltige Signatoren des IdentityLink, der von der Buergerkarte gelesen wird -->
 		<IdentityLinkSigners>
-			<X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
+			<X509SubjectName>CN=zmr,OU=BMI-IV-2,O=BMI,C=AT</X509SubjectName>
 		</IdentityLinkSigners>
 	</AuthComponent>
+	<!-- fuer MOA-ID-PROXY -->
 	<ProxyComponent>
+		<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-ID-AUTH Web Service -->
 		<AuthComponent>
-			<ConnectionParameter URL="http://moatestlinux:18080/moa-id-auth/services/GetAuthenticationData">
-				<AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
-				<ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
+			<ConnectionParameter URL="https://localhost:8443/moa-id-auth/services/GetAuthenticationData">
+			<!--	<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates> -->
+			<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
 			</ConnectionParameter>
 		</AuthComponent>
 	</ProxyComponent>
-	<OnlineApplication publicURLPrefix="https://10.16.126.28:9443/moa-id-proxy/">
+	<!-- Eintrag fuer jede Online-Applikation -->
+	<OnlineApplication publicURLPrefix="https://localhost:8443/">
+		<!-- fuer MOA-ID-AUTH -->
 		<AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
-		<ProxyComponent configFileURL="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/oa/OAConf.xml" sessionTimeOut="600">
-			<ConnectionParameter URL="https://moatestlinux:18443/oa/">
-				<AcceptedServerCertificates>file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/oa/server-certs/tomcat</AcceptedServerCertificates>
-				<ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
+		<!-- fuer MOA-ID-PROXY -->
+		<ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600">
+		<!-- <ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600" loginParameterResolverImpl="at.gv.egovernment.moa.id.proxy.DefaultLoginParameterResolver" loginParameterResolverConfiguration="" connectionBuilderImpl="at.gv.egovernment.moa.id.proxy.DefaultConnectionBuilder"> -->
+			<!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+			<ConnectionParameter URL="http://localhost:8080/oa/">
+			<!--	<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates> -->
+			<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
 			</ConnectionParameter>
 		</ProxyComponent>
 	</OnlineApplication>
+	<!-- ChainingModes fuer die Zertifikatspfadueberpruefung der TLS-Zertifikate -->
 	<ChainingModes systemDefaultMode="pkix">
 		<TrustAnchor mode="chaining">
 			<dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
 			<dsig:X509SerialNumber>536</dsig:X509SerialNumber>
 		</TrustAnchor>
 	</ChainingModes>
-	<GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/certs/cert-store-root"/>
-	<GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
+	<!-- fuer MOA-ID-AUTH: Rootzertifikate des Servers MOA-SP, falls ueber HTTPS angesprochen -->
+	<!-- fuer MOA-ID-PROXY: Rootzertifikate des Servers MOA-ID-AUTH, falls ueber HTTPS angesprochen,
+							und aller Online-Applikationen, die ueber HTTPS angesprochen werden -->
+	<TrustedCACertificates>certs/ca-certs</TrustedCACertificates>
+
+	<!-- Cache-Verzeichnis fuer-Zertifikate -->
+	<GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="certs/certstore"/>
+	<!-- Time-Out fuer die Anmeldung von Beginn bis zum Anlegen der Anmeldedaten, in Sekunden -->
 	<GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
+	<!-- Time-Out fuer die Anmeldung vom Anlegen bis zum Abholen der Anmeldedaten, in Sekunden -->
+	<GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
+	<!-- HTTP Verbindung auf Frontend Servlets zulassen / verbieten (falls Webserver vorgeschaltet wird) -->
+	<!-- <GenericConfiguration name="FrontendServlets.EnableHTTPConnection" value="_true"/>	-->
+	<!-- Angabe eines alternativen DataURLPrefix Werts (bei vorgelagertem Webserver) -->	
+	<!-- <GenericConfiguration name="FrontendServlets.DataURLPrefix" value="http://<servername>/moa-id-auth/"/> -->	
 </MOA-IDConfiguration>
diff --git a/id.server/doc/moa_id/examples/moa-id-env.sh.txt b/id.server/doc/moa_id/examples/moa-id-env.sh.txt
new file mode 100644
index 000000000..1ccca10c1
--- /dev/null
+++ b/id.server/doc/moa_id/examples/moa-id-env.sh.txt
@@ -0,0 +1,15 @@
+rem insert Tomcat 4.1.x home directory (no trailing path separator)
+set CATALINA_HOME=<Tomcat 4.1.x home directory>
+
+CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=$CATALINA_HOME/conf/moa-spss/SampleMOASPSSConfiguration.xml
+CONFIG_OPT_ID=-Dmoa.id.configuration=$CATALINA_HOME/conf/moa-id/SampleMOAIDConfiguration.xml
+
+
+LOGGING_OPT=-Dlog4j.configuration=file:$CATALINA_HOME/conf/moa-id/log4j.properties
+# TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks
+# TRUST_STORE_PASS_OPT=-Djavax.net.ssl.trustStorePassword=changeit
+# TRUST_STORE_TYPE_OPT=-Djavax.net.ssl.trustStoreType=jks
+
+export CATALINA_OPTS="$CONFIG_OPT_SPSS $CONFIG_OPT_ID $LOGGING_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"
+echo CATALINA_OPTS=$CATALINA_OPTS
+
diff --git a/id.server/doc/moa_id/examples/startTomcat.bat.txt b/id.server/doc/moa_id/examples/startTomcat.bat.txt
new file mode 100644
index 000000000..29588120c
--- /dev/null
+++ b/id.server/doc/moa_id/examples/startTomcat.bat.txt
@@ -0,0 +1,26 @@
+rem ----------------------------------------------------------------------------------------------
+rem Modify these entries according to your needs
+
+rem JDK home directory (no trailing path separator)
+set JAVA_HOME=<jdk home directory>
+
+rem Tomcat 4.1.x home directory (no trailing path separator)
+set CATALINA_HOME=<Tomcat 4.1.x home directory>
+
+rem ----------------------------------------------------------------------------------------------
+
+set CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=%CATALINA_HOME%/conf/moa-spss/SampleMOASPSSConfiguration.xml
+set CONFIG_OPT_ID=-Dmoa.id.configuration=%CATALINA_HOME%/conf/moa-id/SampleMOAIDConfiguration.xml
+set LOGGING_OPT=-Dlog4j.configuration=file:%CATALINA_HOME%/conf/moa-id/log4j.properties
+
+set PARAMS_MOA=%CONFIG_OPT_SPSS% %CONFIG_OPT_ID% %LOGGING_OPT%
+
+rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
+rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
+rem set PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks
+rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STORE_TYPE%
+
+set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL% 
+
+cd %CATALINA_HOME%
+bin\catalina.bat start
\ No newline at end of file