From 8c8ddf0a97c65b1b39dad580c45e19cfa7e20a7e Mon Sep 17 00:00:00 2001 From: kstranacher Date: Fri, 17 Feb 2012 18:41:30 +0000 Subject: Update libs (iaik_moa-1.32.jar und iaik_ixsil-1.2.2.5.jar) git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1251 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common/.classpath | 2 +- id/history.txt | 4 ++-- id/readme_1.5.1.txt | 4 ++-- id/server/.classpath | 2 +- id/server/auth/.classpath | 2 +- id/server/idserverlib/.classpath | 2 +- .../moa/id/auth/AuthenticationServer.java | 2 ++ .../moa/id/auth/builder/SAMLArtifactBuilder.java | 22 +++++++++++---------- .../moa/id/util/ParamValidatorUtils.java | 4 ++-- id/server/proxy/.classpath | 2 +- id/templates/.classpath | 2 +- pom.xml | 4 +--- .../prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar | Bin 0 -> 201276 bytes .../iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 | 1 + .../iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 | 1 + .../prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom | 9 +++++++++ .../iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 | 1 + .../iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 | 1 + .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar | Bin 729266 -> 729510 bytes .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.md5 | 1 + .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.sha1 | 1 + .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom | 15 ++++++++------ .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.md5 | 1 + .../iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.sha1 | 1 + spss/handbook/.classpath | 2 +- spss/handbook/clients/.classpath | 2 +- spss/handbook/clients/api/.classpath | 2 +- spss/handbook/clients/referencedData/.classpath | 2 +- spss/handbook/clients/webservice/.classpath | 2 +- spss/handbook/handbook/install/install.html | 6 +++--- spss/server/.classpath | 2 +- spss/server/history.txt | 4 ++-- spss/server/serverlib/.classpath | 2 +- spss/server/serverws/.classpath | 2 +- spss/server/tools/.classpath | 2 +- 35 files changed, 67 insertions(+), 45 deletions(-) create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 create mode 100644 repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 create mode 100644 repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.md5 create mode 100644 repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.sha1 create mode 100644 repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.md5 create mode 100644 repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.sha1 diff --git a/common/.classpath b/common/.classpath index acbdc4f5b..b80d6d2dd 100644 --- a/common/.classpath +++ b/common/.classpath @@ -3,8 +3,8 @@ - + diff --git a/id/history.txt b/id/history.txt index 907a01952..b8122f762 100644 --- a/id/history.txt +++ b/id/history.txt @@ -17,8 +17,8 @@ Version MOA-ID 1.5.1: - Weiterer optionaler Parameter sourceID beim MOA-ID Aufruf - Update der Standard Trustprofile - Libraries aktualisiert: -@TODO - iaik-moa: Version 1.31 + iaik-moa: Version 1.31 + iaik-ixsil: Version 1.2.2.5 Axis: Version 1.0_IAIK ===== diff --git a/id/readme_1.5.1.txt b/id/readme_1.5.1.txt index e86ee5968..dc7df1837 100644 --- a/id/readme_1.5.1.txt +++ b/id/readme_1.5.1.txt @@ -21,8 +21,8 @@ gleichen Verzeichnis): - Weiterer optionaler Parameter sourceID beim MOA-ID Aufruf - Update der Standard Trustprofile - Libraries aktualisiert: -@TODO - iaik-moa: Version 1.31 + iaik-moa: Version 1.31 + iaik-ixsil: Version 1.2.2.5 Axis: Version 1.0_IAIK ------------------------------------------------------------------------------- diff --git a/id/server/.classpath b/id/server/.classpath index f93d181b5..d7501e2c4 100644 --- a/id/server/.classpath +++ b/id/server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath index f724d4325..b730116a1 100644 --- a/id/server/auth/.classpath +++ b/id/server/auth/.classpath @@ -1,7 +1,6 @@ - @@ -10,5 +9,6 @@ + diff --git a/id/server/idserverlib/.classpath b/id/server/idserverlib/.classpath index 1c79cc393..9757920d7 100644 --- a/id/server/idserverlib/.classpath +++ b/id/server/idserverlib/.classpath @@ -3,7 +3,7 @@ - + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 093d22732..bf35b31f2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1679,6 +1679,8 @@ public class AuthenticationServer implements MOAIDAuthConstants { if (isPrPerson.equalsIgnoreCase("pr:PhysicalPerson")) { Node prIdentification = mandatePerson.getFirstChild(); prIdentification.getFirstChild().setTextContent(""); +// Element.appendChild(Document.createTextNode(String)); +// prIdentification.getFirstChild(). } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java index 145664a2b..6a78df9b2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java @@ -74,13 +74,21 @@ public class SAMLArtifactBuilder { // alternative sourceId String alternativeSourceID = AuthConfigurationProvider.getInstance().getGenericConfigurationParameter(GENERIC_CONFIG_PARAM_SOURCEID); - //System.out.println("alternativeSourceID: " + alternativeSourceID); - //System.out.println("authURL: " + authURL); - // if sourceID is given in GET/POST param - use this as source id if (!ParepUtils.isEmpty(sourceIdParam)) { // if GET/POST parameter sourceID is set, use that sourceID instead of authURL; - sourceID = md.digest(sourceIdParam.getBytes()); + //sourceID = md.digest(sourceIdParam.getBytes()); + + // if sourceIdParam is too short (must have 20 characters) - add " " + int length = sourceIdParam.length(); + if (length < 20) { + int l = 20 - length; + for (int i = 0; i < l; i++) { + sourceIdParam += " "; + } + } + + sourceID = sourceIdParam.getBytes(); Logger.info("Building SAMArtifact from sourceID \"" + sourceIdParam + "\" instead of authURL \"" + authURL + "\"."); byte[] assertionHandle = md.digest(sessionID.getBytes()); @@ -90,9 +98,7 @@ public class SAMLArtifactBuilder { out.write(sourceID, 0, 20); out.write(assertionHandle, 0, 20); byte[] samlArtifact = out.toByteArray(); - //System.out.println("samlArtifact: " + new String(samlArtifact)); String samlArtifactBase64 = Base64Utils.encode(samlArtifact); - //System.out.println("samlArtifact Base64: " + samlArtifactBase64); return samlArtifactBase64; } @@ -108,9 +114,7 @@ public class SAMLArtifactBuilder { out.write(sourceID, 0, 20); out.write(assertionHandle, 0, 20); byte[] samlArtifact = out.toByteArray(); - System.out.println("samlArtifact: " + new String(samlArtifact)); String samlArtifactBase64 = Base64Utils.encode(samlArtifact); - System.out.println("samlArtifact Base64: " + samlArtifactBase64); return samlArtifactBase64; } @@ -123,9 +127,7 @@ public class SAMLArtifactBuilder { out.write(sourceID, 0, 20); out.write(assertionHandle, 0, 20); byte[] samlArtifact = out.toByteArray(); - //System.out.println("samlArtifact: " + new String(samlArtifact)); String samlArtifactBase64 = Base64Utils.encode(samlArtifact); - //System.out.println("samlArtifact Base64: " + samlArtifactBase64); return samlArtifactBase64; //System.out.println("sourceID: " + new String(sourceID)); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java index 644e59f72..9df55724e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java @@ -94,7 +94,7 @@ public class ParamValidatorUtils { } - Pattern pattern = Pattern.compile("[\\w-_]{1,50}"); + Pattern pattern = Pattern.compile("[\\w-_]{1,20}"); Matcher matcher = pattern.matcher(sourceID); boolean b = matcher.matches(); if (b) { @@ -102,7 +102,7 @@ public class ParamValidatorUtils { return true; } else { - Logger.error("Fehler Überprüfung Parameter sourceID. SourceID entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, - und _, sowie 1-50 Zeichen lang)"); + Logger.error("Fehler Überprüfung Parameter sourceID. SourceID entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, - und _, sowie 1-20 Zeichen lang)"); return false; } diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath index af4743f8a..df4174ed6 100644 --- a/id/server/proxy/.classpath +++ b/id/server/proxy/.classpath @@ -1,6 +1,5 @@ - @@ -8,5 +7,6 @@ + diff --git a/id/templates/.classpath b/id/templates/.classpath index af4743f8a..df4174ed6 100644 --- a/id/templates/.classpath +++ b/id/templates/.classpath @@ -1,6 +1,5 @@ - @@ -8,5 +7,6 @@ + diff --git a/pom.xml b/pom.xml index d4a0c387a..476ae34f8 100644 --- a/pom.xml +++ b/pom.xml @@ -266,9 +266,7 @@ iaik.prod iaik_ixsil - - - 1.2.2.4_prop + 1.2.2.5 compile diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar new file mode 100644 index 000000000..9ac61d5c2 Binary files /dev/null and b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar differ diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 new file mode 100644 index 000000000..0fb8ee312 --- /dev/null +++ b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.md5 @@ -0,0 +1 @@ +87b8c21a7ad94ba59e315b2d2b432357 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 new file mode 100644 index 000000000..8cdb3d78c --- /dev/null +++ b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar.sha1 @@ -0,0 +1 @@ +294e73c4de7c6ee14ec5b6313a854727a52bec52 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom new file mode 100644 index 000000000..af6c78766 --- /dev/null +++ b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik.prod + iaik_ixsil + 1.2.2.5 + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 new file mode 100644 index 000000000..65bea702c --- /dev/null +++ b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.md5 @@ -0,0 +1 @@ +00b5d4be9a715b6f408acc5690af5141 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 new file mode 100644 index 000000000..5b58b5eee --- /dev/null +++ b/repository/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.pom.sha1 @@ -0,0 +1 @@ +ea0a95ac98300815bf2242da6b2738ba53d02fe9 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar index 13725f801..fe172c3ba 100644 Binary files a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar and b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar differ diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.md5 b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.md5 new file mode 100644 index 000000000..9d6a6bc13 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.md5 @@ -0,0 +1 @@ +aa6c1d4331bbdc8dd0574fcddd79879e \ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.sha1 b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.sha1 new file mode 100644 index 000000000..8ac29fdb4 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar.sha1 @@ -0,0 +1 @@ +fe9bc1a359a3155f0ff748cc81becddaf8f20bc0 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom index c3de037f4..97393614f 100644 --- a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom +++ b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom @@ -1,6 +1,9 @@ - - 4.0.0 - iaik.prod - iaik_moa - 1.32 - \ No newline at end of file + + + 4.0.0 + iaik.prod + iaik_moa + 1.32 + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.md5 b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.md5 new file mode 100644 index 000000000..e3a68c7fd --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.md5 @@ -0,0 +1 @@ +a03dd95996a14f07b1f1e1b7fd98912b \ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.sha1 b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.sha1 new file mode 100644 index 000000000..e00945b47 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.pom.sha1 @@ -0,0 +1 @@ +d8b9485e65e2a84aa7edf5243de6aaf41a2e7618 \ No newline at end of file diff --git a/spss/handbook/.classpath b/spss/handbook/.classpath index f93d181b5..d7501e2c4 100644 --- a/spss/handbook/.classpath +++ b/spss/handbook/.classpath @@ -1,6 +1,6 @@ - + diff --git a/spss/handbook/clients/.classpath b/spss/handbook/clients/.classpath index f93d181b5..d7501e2c4 100644 --- a/spss/handbook/clients/.classpath +++ b/spss/handbook/clients/.classpath @@ -1,6 +1,6 @@ - + diff --git a/spss/handbook/clients/api/.classpath b/spss/handbook/clients/api/.classpath index 8619241eb..0bf65323c 100644 --- a/spss/handbook/clients/api/.classpath +++ b/spss/handbook/clients/api/.classpath @@ -1,7 +1,7 @@ - + diff --git a/spss/handbook/clients/referencedData/.classpath b/spss/handbook/clients/referencedData/.classpath index af4743f8a..df4174ed6 100644 --- a/spss/handbook/clients/referencedData/.classpath +++ b/spss/handbook/clients/referencedData/.classpath @@ -1,6 +1,5 @@ - @@ -8,5 +7,6 @@ + diff --git a/spss/handbook/clients/webservice/.classpath b/spss/handbook/clients/webservice/.classpath index 8619241eb..0bf65323c 100644 --- a/spss/handbook/clients/webservice/.classpath +++ b/spss/handbook/clients/webservice/.classpath @@ -1,7 +1,7 @@ - + diff --git a/spss/handbook/handbook/install/install.html b/spss/handbook/handbook/install/install.html index 9f8f389de..1f9ed69e4 100644 --- a/spss/handbook/handbook/install/install.html +++ b/spss/handbook/handbook/install/install.html @@ -403,9 +403,9 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=<null> moa-spss.jar, moa-common.jar MOA IAIK -1.26  -

lib/iaik_moa-1.26.jar, - lib/iaik_cms-3.2.jar, lib/iaik_ixsil-1.2.2.4.jar

+1.32  +

lib/iaik_moa-1.32.jar, + lib/iaik_cms-3.2.jar, lib/iaik_ixsil-1.2.2.5.jar

diff --git a/spss/server/.classpath b/spss/server/.classpath index f93d181b5..d7501e2c4 100644 --- a/spss/server/.classpath +++ b/spss/server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/spss/server/history.txt b/spss/server/history.txt index 4cb9a75d5..3d4e9d9cb 100644 --- a/spss/server/history.txt +++ b/spss/server/history.txt @@ -8,10 +8,10 @@ - Update der Standard Trustprofile und Standard Konfigurationen - Standard Trustprofil "OfficialSignature" für Amtssignaturen hinzugefügt - Libraries aktualisiert: - iaik-moa: @TODO + iaik-moa: Version 1.31 + iaik-ixsil: Version 1.2.2.5 Axis: Version 1.0_IAIK - ############## 1.5.0 ############## diff --git a/spss/server/serverlib/.classpath b/spss/server/serverlib/.classpath index 1c79cc393..9757920d7 100644 --- a/spss/server/serverlib/.classpath +++ b/spss/server/serverlib/.classpath @@ -3,7 +3,7 @@ - + diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath index 3bcfa0901..5a3431559 100644 --- a/spss/server/serverws/.classpath +++ b/spss/server/serverws/.classpath @@ -1,6 +1,5 @@ - @@ -9,5 +8,6 @@ + diff --git a/spss/server/tools/.classpath b/spss/server/tools/.classpath index ad36587e9..2b6bb65c8 100644 --- a/spss/server/tools/.classpath +++ b/spss/server/tools/.classpath @@ -2,7 +2,7 @@ - + -- cgit v1.2.3