From 76287102b660413b778fc87fc0103b3a023747ee Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 4 Feb 2014 13:11:50 +0100 Subject: * update OAConfig validator * move old documentation to a new directory * add PreRelease docu * add moa-id-proxy sample-config --- .../validation/oa/OAGeneralConfigValidation.java | 5 +- .../main/resources/applicationResources.properties | 4 +- .../conf/moa-id-proxy/MOAIDConfiguration.xml | 67 +++++++ id/server/doc/Architektur ID.vsd | Bin 318464 -> 0 bytes id/server/doc/MOA ID 1.x.wsdl | 41 ----- id/server/doc/MOA-ID Feinspezifikation.doc | Bin 268288 -> 0 bytes id/server/doc/MOA-ID PreRelease-1.9.98.pdf | Bin 0 -> 417730 bytes .../doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx | Bin 117624 -> 0 bytes id/server/doc/MOA-Testzertifikate.pdf | Bin 33476 -> 0 bytes id/server/doc/MOA-Testzertifikate.vsd | Bin 316416 -> 0 bytes id/server/doc/MOA_ID_1.2_20040315.pdf | Bin 577309 -> 0 bytes id/server/doc/MOA_ID_1.3_20060315.pdf | Bin 355156 -> 0 bytes id/server/doc/MOA_ID_1.4_20070802.pdf | Bin 239502 -> 0 bytes id/server/doc/MOA_ID_1.4_Anhang.pdf | Bin 286834 -> 0 bytes id/server/doc/MOA_ID_1.5_Anhang.pdf | Bin 134176 -> 0 bytes id/server/doc/OID-1-0-3.pdf | Bin 347041 -> 0 bytes id/server/doc/bku-auswahl.20030408.pdf | Bin 131587 -> 0 bytes id/server/doc/cs-sstc-schema-assertion-01.xsd | 194 --------------------- id/server/doc/cs-sstc-schema-protocol-01.xsd | 127 -------------- id/server/doc/moa-id.htm | 7 - id/server/doc/old/Architektur ID.vsd | Bin 0 -> 318464 bytes id/server/doc/old/MOA ID 1.x.wsdl | 41 +++++ id/server/doc/old/MOA-ID Feinspezifikation.doc | Bin 0 -> 268288 bytes id/server/doc/old/MOA-Testzertifikate.pdf | Bin 0 -> 33476 bytes id/server/doc/old/MOA-Testzertifikate.vsd | Bin 0 -> 316416 bytes id/server/doc/old/MOA_ID_1.2_20040315.pdf | Bin 0 -> 577309 bytes id/server/doc/old/MOA_ID_1.3_20060315.pdf | Bin 0 -> 355156 bytes id/server/doc/old/MOA_ID_1.4_20070802.pdf | Bin 0 -> 239502 bytes id/server/doc/old/MOA_ID_1.4_Anhang.pdf | Bin 0 -> 286834 bytes id/server/doc/old/MOA_ID_1.5_Anhang.pdf | Bin 0 -> 134176 bytes id/server/doc/old/OID-1-0-3.pdf | Bin 0 -> 347041 bytes id/server/doc/old/bku-auswahl.20030408.pdf | Bin 0 -> 131587 bytes id/server/doc/old/cs-sstc-schema-assertion-01.xsd | 194 +++++++++++++++++++++ id/server/doc/old/cs-sstc-schema-protocol-01.xsd | 127 ++++++++++++++ id/server/doc/old/moa-id.htm | 7 + 35 files changed, 442 insertions(+), 372 deletions(-) create mode 100644 id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml delete mode 100644 id/server/doc/Architektur ID.vsd delete mode 100644 id/server/doc/MOA ID 1.x.wsdl delete mode 100644 id/server/doc/MOA-ID Feinspezifikation.doc create mode 100644 id/server/doc/MOA-ID PreRelease-1.9.98.pdf delete mode 100644 id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx delete mode 100644 id/server/doc/MOA-Testzertifikate.pdf delete mode 100644 id/server/doc/MOA-Testzertifikate.vsd delete mode 100644 id/server/doc/MOA_ID_1.2_20040315.pdf delete mode 100644 id/server/doc/MOA_ID_1.3_20060315.pdf delete mode 100644 id/server/doc/MOA_ID_1.4_20070802.pdf delete mode 100644 id/server/doc/MOA_ID_1.4_Anhang.pdf delete mode 100644 id/server/doc/MOA_ID_1.5_Anhang.pdf delete mode 100644 id/server/doc/OID-1-0-3.pdf delete mode 100644 id/server/doc/bku-auswahl.20030408.pdf delete mode 100644 id/server/doc/cs-sstc-schema-assertion-01.xsd delete mode 100644 id/server/doc/cs-sstc-schema-protocol-01.xsd delete mode 100644 id/server/doc/moa-id.htm create mode 100644 id/server/doc/old/Architektur ID.vsd create mode 100644 id/server/doc/old/MOA ID 1.x.wsdl create mode 100644 id/server/doc/old/MOA-ID Feinspezifikation.doc create mode 100644 id/server/doc/old/MOA-Testzertifikate.pdf create mode 100644 id/server/doc/old/MOA-Testzertifikate.vsd create mode 100644 id/server/doc/old/MOA_ID_1.2_20040315.pdf create mode 100644 id/server/doc/old/MOA_ID_1.3_20060315.pdf create mode 100644 id/server/doc/old/MOA_ID_1.4_20070802.pdf create mode 100644 id/server/doc/old/MOA_ID_1.4_Anhang.pdf create mode 100644 id/server/doc/old/MOA_ID_1.5_Anhang.pdf create mode 100644 id/server/doc/old/OID-1-0-3.pdf create mode 100644 id/server/doc/old/bku-auswahl.20030408.pdf create mode 100644 id/server/doc/old/cs-sstc-schema-assertion-01.xsd create mode 100644 id/server/doc/old/cs-sstc-schema-protocol-01.xsd create mode 100644 id/server/doc/old/moa-id.htm 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 @@ + + + + + + + + + certs/server-certs + + + + + + + + + + + + + + certs/server-certs + + + + + + + + + + + + + + certs/server-certs + + + + + + + + + + certs/ca-certs + + + + + + + + + + + + + diff --git a/id/server/doc/Architektur ID.vsd b/id/server/doc/Architektur ID.vsd deleted file mode 100644 index d4678007a..000000000 Binary files a/id/server/doc/Architektur ID.vsd and /dev/null differ diff --git a/id/server/doc/MOA ID 1.x.wsdl b/id/server/doc/MOA ID 1.x.wsdl deleted file mode 100644 index 4d1c8d71d..000000000 --- a/id/server/doc/MOA ID 1.x.wsdl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/doc/MOA-ID Feinspezifikation.doc b/id/server/doc/MOA-ID Feinspezifikation.doc deleted file mode 100644 index e71ffa8e6..000000000 Binary files a/id/server/doc/MOA-ID Feinspezifikation.doc and /dev/null differ 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 Binary files /dev/null and b/id/server/doc/MOA-ID PreRelease-1.9.98.pdf 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 Binary files a/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx and /dev/null differ diff --git a/id/server/doc/MOA-Testzertifikate.pdf b/id/server/doc/MOA-Testzertifikate.pdf deleted file mode 100644 index a2c44f2a2..000000000 Binary files a/id/server/doc/MOA-Testzertifikate.pdf and /dev/null differ diff --git a/id/server/doc/MOA-Testzertifikate.vsd b/id/server/doc/MOA-Testzertifikate.vsd deleted file mode 100644 index c36051c04..000000000 Binary files a/id/server/doc/MOA-Testzertifikate.vsd and /dev/null differ diff --git a/id/server/doc/MOA_ID_1.2_20040315.pdf b/id/server/doc/MOA_ID_1.2_20040315.pdf deleted file mode 100644 index 0c89c2730..000000000 Binary files a/id/server/doc/MOA_ID_1.2_20040315.pdf and /dev/null differ diff --git a/id/server/doc/MOA_ID_1.3_20060315.pdf b/id/server/doc/MOA_ID_1.3_20060315.pdf deleted file mode 100644 index c9b0d160c..000000000 Binary files a/id/server/doc/MOA_ID_1.3_20060315.pdf and /dev/null differ diff --git a/id/server/doc/MOA_ID_1.4_20070802.pdf b/id/server/doc/MOA_ID_1.4_20070802.pdf deleted file mode 100644 index a3a2f1177..000000000 Binary files a/id/server/doc/MOA_ID_1.4_20070802.pdf and /dev/null differ diff --git a/id/server/doc/MOA_ID_1.4_Anhang.pdf b/id/server/doc/MOA_ID_1.4_Anhang.pdf deleted file mode 100644 index 0c923666f..000000000 Binary files a/id/server/doc/MOA_ID_1.4_Anhang.pdf and /dev/null differ diff --git a/id/server/doc/MOA_ID_1.5_Anhang.pdf b/id/server/doc/MOA_ID_1.5_Anhang.pdf deleted file mode 100644 index ed2743d3c..000000000 Binary files a/id/server/doc/MOA_ID_1.5_Anhang.pdf and /dev/null differ diff --git a/id/server/doc/OID-1-0-3.pdf b/id/server/doc/OID-1-0-3.pdf deleted file mode 100644 index 4beab3e41..000000000 Binary files a/id/server/doc/OID-1-0-3.pdf and /dev/null differ diff --git a/id/server/doc/bku-auswahl.20030408.pdf b/id/server/doc/bku-auswahl.20030408.pdf deleted file mode 100644 index 39efe315f..000000000 Binary files a/id/server/doc/bku-auswahl.20030408.pdf and /dev/null differ diff --git a/id/server/doc/cs-sstc-schema-assertion-01.xsd b/id/server/doc/cs-sstc-schema-assertion-01.xsd deleted file mode 100644 index 8bc5af147..000000000 --- a/id/server/doc/cs-sstc-schema-assertion-01.xsd +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - Document identifier: cs-sstc-schema-assertion-01 - Location: http://www.oasis-open.org/committees/security/docs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/doc/cs-sstc-schema-protocol-01.xsd b/id/server/doc/cs-sstc-schema-protocol-01.xsd deleted file mode 100644 index ecad05b0f..000000000 --- a/id/server/doc/cs-sstc-schema-protocol-01.xsd +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - Document identifier: cs-sstc-schema-protocol-01 - Location: http://www.oasis-open.org/committees/security/docs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/doc/moa-id.htm b/id/server/doc/moa-id.htm deleted file mode 100644 index 82e5adc19..000000000 --- a/id/server/doc/moa-id.htm +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/id/server/doc/old/Architektur ID.vsd b/id/server/doc/old/Architektur ID.vsd new file mode 100644 index 000000000..d4678007a Binary files /dev/null and b/id/server/doc/old/Architektur ID.vsd differ diff --git a/id/server/doc/old/MOA ID 1.x.wsdl b/id/server/doc/old/MOA ID 1.x.wsdl new file mode 100644 index 000000000..4d1c8d71d --- /dev/null +++ b/id/server/doc/old/MOA ID 1.x.wsdl @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/doc/old/MOA-ID Feinspezifikation.doc b/id/server/doc/old/MOA-ID Feinspezifikation.doc new file mode 100644 index 000000000..e71ffa8e6 Binary files /dev/null and b/id/server/doc/old/MOA-ID Feinspezifikation.doc differ diff --git a/id/server/doc/old/MOA-Testzertifikate.pdf b/id/server/doc/old/MOA-Testzertifikate.pdf new file mode 100644 index 000000000..a2c44f2a2 Binary files /dev/null and b/id/server/doc/old/MOA-Testzertifikate.pdf differ diff --git a/id/server/doc/old/MOA-Testzertifikate.vsd b/id/server/doc/old/MOA-Testzertifikate.vsd new file mode 100644 index 000000000..c36051c04 Binary files /dev/null and b/id/server/doc/old/MOA-Testzertifikate.vsd differ diff --git a/id/server/doc/old/MOA_ID_1.2_20040315.pdf b/id/server/doc/old/MOA_ID_1.2_20040315.pdf new file mode 100644 index 000000000..0c89c2730 Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.2_20040315.pdf differ diff --git a/id/server/doc/old/MOA_ID_1.3_20060315.pdf b/id/server/doc/old/MOA_ID_1.3_20060315.pdf new file mode 100644 index 000000000..c9b0d160c Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.3_20060315.pdf differ diff --git a/id/server/doc/old/MOA_ID_1.4_20070802.pdf b/id/server/doc/old/MOA_ID_1.4_20070802.pdf new file mode 100644 index 000000000..a3a2f1177 Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.4_20070802.pdf differ diff --git a/id/server/doc/old/MOA_ID_1.4_Anhang.pdf b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf new file mode 100644 index 000000000..0c923666f Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf differ diff --git a/id/server/doc/old/MOA_ID_1.5_Anhang.pdf b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf new file mode 100644 index 000000000..ed2743d3c Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf differ diff --git a/id/server/doc/old/OID-1-0-3.pdf b/id/server/doc/old/OID-1-0-3.pdf new file mode 100644 index 000000000..4beab3e41 Binary files /dev/null and b/id/server/doc/old/OID-1-0-3.pdf differ diff --git a/id/server/doc/old/bku-auswahl.20030408.pdf b/id/server/doc/old/bku-auswahl.20030408.pdf new file mode 100644 index 000000000..39efe315f Binary files /dev/null and b/id/server/doc/old/bku-auswahl.20030408.pdf differ diff --git a/id/server/doc/old/cs-sstc-schema-assertion-01.xsd b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd new file mode 100644 index 000000000..8bc5af147 --- /dev/null +++ b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd @@ -0,0 +1,194 @@ + + + + + + + Document identifier: cs-sstc-schema-assertion-01 + Location: http://www.oasis-open.org/committees/security/docs/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/doc/old/cs-sstc-schema-protocol-01.xsd b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd new file mode 100644 index 000000000..ecad05b0f --- /dev/null +++ b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd @@ -0,0 +1,127 @@ + + + + + + + + Document identifier: cs-sstc-schema-protocol-01 + Location: http://www.oasis-open.org/committees/security/docs/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/doc/old/moa-id.htm b/id/server/doc/old/moa-id.htm new file mode 100644 index 000000000..82e5adc19 --- /dev/null +++ b/id/server/doc/old/moa-id.htm @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file -- cgit v1.2.3