aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-02-04 13:11:50 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-02-04 13:11:50 +0100
commit76287102b660413b778fc87fc0103b3a023747ee (patch)
treebb91787b6720873c3af97b5872b1d3c281fd33e6
parent04636e11d108f26df4712c62be108d68ba166e0a (diff)
downloadmoa-id-spss-76287102b660413b778fc87fc0103b3a023747ee.tar.gz
moa-id-spss-76287102b660413b778fc87fc0103b3a023747ee.tar.bz2
moa-id-spss-76287102b660413b778fc87fc0103b3a023747ee.zip
* update OAConfig validator
* move old documentation to a new directory * add PreRelease docu * add moa-id-proxy sample-config
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java5
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources.properties4
-rw-r--r--id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml67
-rw-r--r--id/server/doc/MOA-ID PreRelease-1.9.98.pdfbin0 -> 417730 bytes
-rw-r--r--id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docxbin117624 -> 0 bytes
-rw-r--r--id/server/doc/old/Architektur ID.vsd (renamed from id/server/doc/Architektur ID.vsd)bin318464 -> 318464 bytes
-rw-r--r--id/server/doc/old/MOA ID 1.x.wsdl (renamed from id/server/doc/MOA ID 1.x.wsdl)0
-rw-r--r--id/server/doc/old/MOA-ID Feinspezifikation.doc (renamed from id/server/doc/MOA-ID Feinspezifikation.doc)bin268288 -> 268288 bytes
-rw-r--r--id/server/doc/old/MOA-Testzertifikate.pdf (renamed from id/server/doc/MOA-Testzertifikate.pdf)bin33476 -> 33476 bytes
-rw-r--r--id/server/doc/old/MOA-Testzertifikate.vsd (renamed from id/server/doc/MOA-Testzertifikate.vsd)bin316416 -> 316416 bytes
-rw-r--r--id/server/doc/old/MOA_ID_1.2_20040315.pdf (renamed from id/server/doc/MOA_ID_1.2_20040315.pdf)bin577309 -> 577309 bytes
-rw-r--r--id/server/doc/old/MOA_ID_1.3_20060315.pdf (renamed from id/server/doc/MOA_ID_1.3_20060315.pdf)bin355156 -> 355156 bytes
-rw-r--r--id/server/doc/old/MOA_ID_1.4_20070802.pdf (renamed from id/server/doc/MOA_ID_1.4_20070802.pdf)bin239502 -> 239502 bytes
-rw-r--r--id/server/doc/old/MOA_ID_1.4_Anhang.pdf (renamed from id/server/doc/MOA_ID_1.4_Anhang.pdf)bin286834 -> 286834 bytes
-rw-r--r--id/server/doc/old/MOA_ID_1.5_Anhang.pdf (renamed from id/server/doc/MOA_ID_1.5_Anhang.pdf)bin134176 -> 134176 bytes
-rw-r--r--id/server/doc/old/OID-1-0-3.pdf (renamed from id/server/doc/OID-1-0-3.pdf)bin347041 -> 347041 bytes
-rw-r--r--id/server/doc/old/bku-auswahl.20030408.pdf (renamed from id/server/doc/bku-auswahl.20030408.pdf)bin131587 -> 131587 bytes
-rw-r--r--id/server/doc/old/cs-sstc-schema-assertion-01.xsd (renamed from id/server/doc/cs-sstc-schema-assertion-01.xsd)0
-rw-r--r--id/server/doc/old/cs-sstc-schema-protocol-01.xsd (renamed from id/server/doc/cs-sstc-schema-protocol-01.xsd)0
-rw-r--r--id/server/doc/old/moa-id.htm (renamed from id/server/doc/moa-id.htm)0
20 files changed, 73 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
index 9c950fb66..c84c44de4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
@@ -100,9 +100,12 @@ public class OAGeneralConfigValidation {
if (MiscUtil.isNotEmpty(check)) {
if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
log.warn("OAFriendlyName contains potentail XSS characters: " + check);
- errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname",
+ errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid",
new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
}
+ } else {
+ log.info("OA friendlyName is empty");
+ errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty"));
}
if (isAdmin) {
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index d82855616..e20e70d75 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -353,7 +353,7 @@ validation.general.bku.local.empty=Die URL f\u00FCr die lokale BKU ist leer.
validation.general.bku.local.valid=Die URL f\u00FCr die locale BKU hat kein g\u00FCltiges Format.
validation.general.bku.online.empty=Die URL f\u00FCr die Online-BKU ist leer.
validation.general.bku.online.valid=Die URL f\u00FCr die Online-BKU hat kein g\u00FCltiges Format.
-validation.general.oafriendlyname.empty=Es wurde keine Online-Applikation angegeben.
+validation.general.oafriendlyname.empty=Es wurde kein Name f\u00FCr die Online-Applikation angegeben.
validation.general.oafriendlyname=Der Name der Online-Applikation enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
validation.general.keyboxidentifier.empty=Es wurde kein KeyBoxIdentifier ausgew\u00E4hlt.
validation.general.keyboxidentifier.valid=Der KeyBoxIdentifier hat ein ung\u00FCltiges Format.
@@ -383,7 +383,7 @@ validation.stork.cpeps.cc=CPEPS L\u00E4ndercode folgt nicht ISO 3166-2
validation.stork.cpeps.empty=CPEPS Konfiguration ist unvollst\u00E4ndig
validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
-validation.stork.qaa.outofrange=Gültige QAA Werte sind 1, 2, 3, und 4
+validation.stork.qaa.outofrange=G�ltige QAA Werte sind 1, 2, 3, und 4
validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
validation.pvp2.metadataurl.empty=Keine Metadaten URL angegeben.
diff --git a/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
new file mode 100644
index 000000000..51b36a1da
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Beispielkonfiguration fuer MOA-ID -->
+<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#">
+ <!-- Konfiguration fuer MOA-ID-PROXY -->
+ <ProxyComponent>
+ <!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-ID-AUTH Web Service -->
+ <AuthComponent>
+ <ConnectionParameter URL="http://labda.iaik.tugraz.at:8080/moa-id-auth/services/GetAuthenticationData">
+ <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+ <!-- <ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+ </ConnectionParameter>
+ </AuthComponent>
+ </ProxyComponent>
+
+ <!-- Eintragung fuer jede Online-Applikation -->
+ <!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+ <OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+ <!-- fuer MOA-ID-PROXY -->
+ <ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600"
+ loginParameterResolverImpl="at.gv.egiz.moa.id.proxy.MySQLLoginParameterResolver"
+ loginParameterResolverConfiguration="/var/lib/tomcat6/webapps/moa-id-proxy-umgmt/WEB-INF/classes/hibernate.cfg.xml"
+ connectionBuilderImpl="at.gv.egovernment.moa.id.proxy.EnhancedConnectionBuilder"
+ errorRedirectURL="https://proxy.gv.at/oa2">
+
+ <!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+ <ConnectionParameter URL="https://proxy.gv.at/oa">
+ <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+ <!-- <ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+ </ConnectionParameter>
+ </ProxyComponent>
+ </OnlineApplication>
+
+ <!-- Eintragung fuer jede Online-Applikation -->
+ <!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+ <OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+ <!-- fuer MOA-ID-PROXY -->
+ <ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600"
+ errorRedirectURL="https://proxy.gv.at/oa2">
+
+ <!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+ <ConnectionParameter URL="https://proxy.gv.at/oa">
+ <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+ <!-- <ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+ </ConnectionParameter>
+ </ProxyComponent>
+ </OnlineApplication>
+
+ <!-- ChainingModes fuer die Zertifikatspfadueberpruefug der TLS-Zertifikate -->
+ <ChainingModes systemDefaultMode="pkix">
+ </ChainingModes>
+ <!-- fuer MOA-ID-AUTH: CA-Zertifikat des Servers MOA-SP, falls dieses Service ueber HTTPS angesprochen wird
+ fuer MOA-ID-PROXY: CA-Zertifikat des Servers MOA-ID-AUTH, falls dieses Service ueber HTTPS angesprochen wird
+ zusaeztlich: CA-Zertifikat aller Online-Applikationen, die ueber HTTPS angesprochen werden -->
+ <TrustedCACertificates>certs/ca-certs</TrustedCACertificates>
+ <!-- Cache-Verzeichnis fuer-Zertifikate -->
+ <!-- Hinweis: wenn TC in linux oder unix betrieben wird vollstaendigen pfad fuer DirectoryCertStoreParameters.RootDir verwenden -->
+ <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="/etc/tomcat6/moa-id/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"/>
+ <!-- Alternatives Data URL prefix (falls Webserver vorgeschaltet wird) -->
+ <!--GenericConfiguration name="FrontendServlets.DataURLPrefix" value="https://<your_webserver>/moa-id-auth/"/ -->
+ <!-- HTTP Verbindung auf Frontend Servlets zulassen / verbieten (falls Webserver vorgeschaltet wird) -->
+ <!-- GenericConfiguration name="FrontendServlets.EnableHTTPConnection" value="true"/ -->
+ <!-- URL Liste der vertrauenwürdigen Bürgekartenumgebungen -->
+</MOA-IDConfiguration>
diff --git a/id/server/doc/MOA-ID PreRelease-1.9.98.pdf b/id/server/doc/MOA-ID PreRelease-1.9.98.pdf
new file mode 100644
index 000000000..527251961
--- /dev/null
+++ b/id/server/doc/MOA-ID PreRelease-1.9.98.pdf
Binary files differ
diff --git a/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx b/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx
deleted file mode 100644
index 9c63cd941..000000000
--- a/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx
+++ /dev/null
Binary files differ
diff --git a/id/server/doc/Architektur ID.vsd b/id/server/doc/old/Architektur ID.vsd
index d4678007a..d4678007a 100644
--- a/id/server/doc/Architektur ID.vsd
+++ b/id/server/doc/old/Architektur ID.vsd
Binary files differ
diff --git a/id/server/doc/MOA ID 1.x.wsdl b/id/server/doc/old/MOA ID 1.x.wsdl
index 4d1c8d71d..4d1c8d71d 100644
--- a/id/server/doc/MOA ID 1.x.wsdl
+++ b/id/server/doc/old/MOA ID 1.x.wsdl
diff --git a/id/server/doc/MOA-ID Feinspezifikation.doc b/id/server/doc/old/MOA-ID Feinspezifikation.doc
index e71ffa8e6..e71ffa8e6 100644
--- a/id/server/doc/MOA-ID Feinspezifikation.doc
+++ b/id/server/doc/old/MOA-ID Feinspezifikation.doc
Binary files differ
diff --git a/id/server/doc/MOA-Testzertifikate.pdf b/id/server/doc/old/MOA-Testzertifikate.pdf
index a2c44f2a2..a2c44f2a2 100644
--- a/id/server/doc/MOA-Testzertifikate.pdf
+++ b/id/server/doc/old/MOA-Testzertifikate.pdf
Binary files differ
diff --git a/id/server/doc/MOA-Testzertifikate.vsd b/id/server/doc/old/MOA-Testzertifikate.vsd
index c36051c04..c36051c04 100644
--- a/id/server/doc/MOA-Testzertifikate.vsd
+++ b/id/server/doc/old/MOA-Testzertifikate.vsd
Binary files differ
diff --git a/id/server/doc/MOA_ID_1.2_20040315.pdf b/id/server/doc/old/MOA_ID_1.2_20040315.pdf
index 0c89c2730..0c89c2730 100644
--- a/id/server/doc/MOA_ID_1.2_20040315.pdf
+++ b/id/server/doc/old/MOA_ID_1.2_20040315.pdf
Binary files differ
diff --git a/id/server/doc/MOA_ID_1.3_20060315.pdf b/id/server/doc/old/MOA_ID_1.3_20060315.pdf
index c9b0d160c..c9b0d160c 100644
--- a/id/server/doc/MOA_ID_1.3_20060315.pdf
+++ b/id/server/doc/old/MOA_ID_1.3_20060315.pdf
Binary files differ
diff --git a/id/server/doc/MOA_ID_1.4_20070802.pdf b/id/server/doc/old/MOA_ID_1.4_20070802.pdf
index a3a2f1177..a3a2f1177 100644
--- a/id/server/doc/MOA_ID_1.4_20070802.pdf
+++ b/id/server/doc/old/MOA_ID_1.4_20070802.pdf
Binary files differ
diff --git a/id/server/doc/MOA_ID_1.4_Anhang.pdf b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf
index 0c923666f..0c923666f 100644
--- a/id/server/doc/MOA_ID_1.4_Anhang.pdf
+++ b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf
Binary files differ
diff --git a/id/server/doc/MOA_ID_1.5_Anhang.pdf b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf
index ed2743d3c..ed2743d3c 100644
--- a/id/server/doc/MOA_ID_1.5_Anhang.pdf
+++ b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf
Binary files differ
diff --git a/id/server/doc/OID-1-0-3.pdf b/id/server/doc/old/OID-1-0-3.pdf
index 4beab3e41..4beab3e41 100644
--- a/id/server/doc/OID-1-0-3.pdf
+++ b/id/server/doc/old/OID-1-0-3.pdf
Binary files differ
diff --git a/id/server/doc/bku-auswahl.20030408.pdf b/id/server/doc/old/bku-auswahl.20030408.pdf
index 39efe315f..39efe315f 100644
--- a/id/server/doc/bku-auswahl.20030408.pdf
+++ b/id/server/doc/old/bku-auswahl.20030408.pdf
Binary files differ
diff --git a/id/server/doc/cs-sstc-schema-assertion-01.xsd b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd
index 8bc5af147..8bc5af147 100644
--- a/id/server/doc/cs-sstc-schema-assertion-01.xsd
+++ b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd
diff --git a/id/server/doc/cs-sstc-schema-protocol-01.xsd b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd
index ecad05b0f..ecad05b0f 100644
--- a/id/server/doc/cs-sstc-schema-protocol-01.xsd
+++ b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd
diff --git a/id/server/doc/moa-id.htm b/id/server/doc/old/moa-id.htm
index 82e5adc19..82e5adc19 100644
--- a/id/server/doc/moa-id.htm
+++ b/id/server/doc/old/moa-id.htm