From 8d10b11ffa05104fabf242474cc35bc456744ace Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 5 Aug 2019 12:22:31 +0200 Subject: refactor to eIDAS-Node v2.3.0 and use Apache Ignite as new cache implementation refactor to multi-language support --- eidas_modules/authmodule-eIDAS-v2/pom.xml | 13 +- .../2.3.0/eidas-commons-2.3.0-sources.jar | Bin 0 -> 193006 bytes .../eidas-commons/2.3.0/eidas-commons-2.3.0.jar | Bin 0 -> 276591 bytes .../eidas-commons/2.3.0/eidas-commons-2.3.0.pom | 109 +++ ...-jcache-ignite-specific-communication-2.3.0.jar | Bin 0 -> 6205 bytes ...-jcache-ignite-specific-communication-2.3.0.pom | 61 ++ .../2.3.0/eidas-jcache-ignite-2.3.0.jar | Bin 0 -> 3045 bytes .../2.3.0/eidas-jcache-ignite-2.3.0.pom | 94 +++ .../2.3.0/eidas-light-commons-2.3.0-sources.jar | Bin 0 -> 80949 bytes .../2.3.0/eidas-light-commons-2.3.0.jar | Bin 0 -> 116119 bytes .../2.3.0/eidas-light-commons-2.3.0.pom | 55 ++ .../eidas-parent/2.3.0/eidas-parent-2.3.0.pom | 906 +++++++++++++++++++++ ...ific-communication-definition-2.3.0-sources.jar | Bin 0 -> 25570 bytes ...das-specific-communication-definition-2.3.0.jar | Bin 0 -> 28806 bytes ...das-specific-communication-definition-2.3.0.pom | 113 +++ .../tasks/GenerateAuthnRequestTask.java | 11 +- .../resources/templates/eidas_node_forward.html | 14 +- 17 files changed, 1365 insertions(+), 11 deletions(-) create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0-sources.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.pom create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.pom create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.pom create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0-sources.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.pom create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.3.0/eidas-parent-2.3.0.pom create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0-sources.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.jar create mode 100644 eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.pom (limited to 'eidas_modules') diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml index b3e66c44..ea6f1800 100644 --- a/eidas_modules/authmodule-eIDAS-v2/pom.xml +++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml @@ -12,9 +12,10 @@ eIDAS module based on eIDAS node reference implementation v2.x - 2.2.1-egiz - 2.2.1-egiz - 2.2.1-egiz + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 3.23.1 @@ -85,6 +86,12 @@ ${eidas-specific-communication-definition.version} + + eu.eidas + eidas-jcache-ignite-specific-communication + ${eidas-jcache-ignite-specific-communication.version} + + org.apache.commons diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0-sources.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0-sources.jar new file mode 100644 index 00000000..b6e62460 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0-sources.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.jar new file mode 100644 index 00000000..c48ff7d1 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.pom new file mode 100644 index 00000000..395564ee --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.3.0/eidas-commons-2.3.0.pom @@ -0,0 +1,109 @@ + + 4.0.0 + eidas-commons + ${mod.packaging.type} + eIDAS Commons + + The EIDASCommons library provides beans, Java Interfaces and utility classes to integrate EidasNode and SAML + Engine. + + + eu.eidas + eidas-parent + 2.3.0 + ../EIDAS-Parent/pom.xml + + + + eu.eidas + eidas-light-commons + + + org.slf4j + slf4j-api + + + org.bouncycastle + bcprov-jdk15on + + + + javax.servlet + javax.servlet-api + + + org.owasp.encoder + encoder + + + com.hazelcast + hazelcast + + + com.hazelcast + hazelcast-wm + + + javax.cache + cache-api + 1.1.0 + + + + ch.qos.logback + logback-classic + test + + + aopalliance + aopalliance + 1.0 + test + + + + + + + ${project.basedir}/src/main/resources + + + + + org.apache.maven.plugins + maven-source-plugin + + + + + src/test/resources + + log4j.xml + *.properties + + + + + + + metrics + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.jar new file mode 100644 index 00000000..414e5022 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.pom new file mode 100644 index 00000000..0ac5ffbb --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.3.0/eidas-jcache-ignite-specific-communication-2.3.0.pom @@ -0,0 +1,61 @@ + + + 4.0.0 + eidas-jcache-ignite-specific-communication + jar + eIDAS JCache Ignite Specific Communication + Implements JCache using Ignite with Specific Communication Definition's beans configurations. + + + eu.eidas + eidas-parent + 2.3.0 + ../EIDAS-Parent/pom.xml + + + + 2.7.0 + + + + + eu.eidas + eidas-jcache-ignite + + + org.springframework + spring-context + test + + + org.slf4j + slf4j-simple + test + + + org.apache.ignite + ignite-slf4j + ${ignite.version} + test + + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.jar new file mode 100644 index 00000000..f9be7373 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.pom new file mode 100644 index 00000000..fcf5870c --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.3.0/eidas-jcache-ignite-2.3.0.pom @@ -0,0 +1,94 @@ + + 4.0.0 + eidas-jcache-ignite + jar + eIDAS JCache Ignite + Implements JCache using Ignite. + + + eu.eidas + eidas-parent + 2.3.0 + ../EIDAS-Parent/pom.xml + + + + 2.7.0 + + + + + eu.eidas + eidas-commons + + + commons-logging + commons-logging + + + org.apache.ignite + ignite-core + ${ignite.version} + + + org.gridgain + ignite-shmem + + + + + org.apache.ignite + ignite-spring + ${ignite.version} + + + org.apache.ignite + ignite-indexing + + + org.springframework + spring-core + + + org.springframework + spring-aop + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-expression + + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + commons-logging + commons-logging + + + + + javax.servlet + javax.servlet-api + + + org.apache.ignite + ignite-slf4j + ${ignite.version} + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0-sources.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0-sources.jar new file mode 100644 index 00000000..82a3ad74 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0-sources.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.jar new file mode 100644 index 00000000..845f8ab2 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.pom new file mode 100644 index 00000000..a9813636 --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.3.0/eidas-light-commons-2.3.0.pom @@ -0,0 +1,55 @@ + + 4.0.0 + eidas-light-commons + ${mod.packaging.type} + eIDAS Light Commons + + The EIDASLightCommons library provides Java Interfaces and utility classes to integrate EIDASCommons and eIDAS Specific Communication Definition. + + + eu.eidas + eidas-parent + 2.3.0 + ../EIDAS-Parent/pom.xml + + + + joda-time + joda-time + + + com.ibm.icu + icu4j + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + + + metrics + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.3.0/eidas-parent-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.3.0/eidas-parent-2.3.0.pom new file mode 100644 index 00000000..fa4680c8 --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.3.0/eidas-parent-2.3.0.pom @@ -0,0 +1,906 @@ + + + 4.0.0 + eu.eidas + eidas-parent + pom + eIDAS Node Parent + 2.3.0 + + The EIDAS-Parent provides artifacts versions for Eidas Node components. + + + + EIDASParent + EidasNode + UTF-8 + war + jar + ${maven.build.timestamp} + + 1.8 + + 0.5.2 + 0.5.1 + + + 4.3.18.RELEASE + 0.3.9 + 1.5.5 + 3.3.0 + 3.3.0 + + 7.3.0 + 3.0.1 + 2.0 + 1.1.2 + 1.2.5 + 6.0.53 + 1.7.10 + 1.1.2 + 1.10.19 + 4.12 + 1.3 + 1.9 + 3.2.2 + 2.4 + 2.6 + 1.1.3 + 4.5.5 + 4.4.9 + 3.1 + 3.2 + 1.60 + 1.1.1 + 1.4.0 + 2.6 + 1.2.17 + 2.3 + 1.5 + 1.2.2 + 2.3.34 + + 7.4.2 + ${vaadin.version} + 1.0.0.beta1 + 0.0.5.RELEASE + 9.2.3.v20140905 + 19.0 + 3.0.1 + 57.1 + + + 2.8.1 + 2.3.2 + 2.19.1 + 3.2.0 + 2.7 + 2.4 + 2.7 + 1.5 + 2.1.2 + 2.5.2 + 2.6.1 + + + + + + + eu.eidas + SimpleProtocol + 0.0.2 + + + eu.eidas + eidas-commons + ${project.version} + + + eu.eidas + eidas-light-commons + ${project.version} + + + eu.eidas + eidas-configmodule + ${project.version} + + + eu.eidas + eidas-encryption + ${project.version} + + + eu.eidas + eidas-saml-engine + ${project.version} + + + eu.eidas + eidas-updater + ${project.version} + + + eu.eidas + eidas-saml-metadata + ${project.version} + + + eu.eidas + eidas-specific-connector + ${project.version} + + + eu.eidas + eidas-specific-proxyservice + ${project.version} + + + eu.eidas + eidas-specific-communication-definition + ${project.version} + + + eu.eidas + eidas-jcache-dev + ${project.version} + + + eu.eidas + eidas-jcache-dev-node + ${project.version} + + + eu.eidas + eidas-jcache-dev-specific-communication + ${project.version} + + + eu.eidas + eidas-jcache-ignite + ${project.version} + + + eu.eidas + eidas-jcache-ignite-node + ${project.version} + + + eu.eidas + eidas-jcache-ignite-specific-communication + ${project.version} + + + eu.eidas + eidas-jcache-hazelcast + ${project.version} + + + eu.eidas + eidas-jcache-hazelcast-node + ${project.version} + + + eu.eidas + eidas-jcache-hazelcast-specific-communication + ${project.version} + + + eu.eidas + eidas-node + ${project.version} + + + eu.eidas + eidas-sp + ${project.version} + + + eu.eidas + eidas-idp + ${project.version} + + + + joda-time + joda-time + ${joda.time.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + + commons-logging + commons-logging + ${commons.logging} + + + + log4j + log4j + ${log4j.version} + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + mail + javax.mail + + + + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + slf4j-api + + + + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + provided + + + + commons-codec + commons-codec + ${commons.codec} + + + commons-collections + commons-collections + ${commons.collections} + + + org.apache.httpcomponents + httpclient + ${commons.httpclient} + + + commons-logging + commons-logging + + + commons-codec + commons-codec + + + + + org.apache.httpcomponents + httpcore + ${commons.httpcore} + + + commons-logging + commons-logging + + + + + commons-io + commons-io + ${commons.io} + + + commons-lang + commons-lang + ${commons.lang} + + + org.owasp.encoder + encoder + ${owasp.version} + + + org.owasp.encoder + encoder-jsp + ${owasp.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + provided + + + org.opensaml + opensaml-core + ${opensaml.version} + + + commons-codec + commons-codec + + + commons-collections + commons-collections + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + javax.servlet + servlet-api + + + joda-time + joda-time + + + junit + junit + + + log4j + log4j + + + org.apache.velocity + velocity + + + org.bouncycastle + bcprov-jdk15on + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + log4j-over-slf4j + + + org.slf4j + jul-to-slf4j + + + org.springframework + spring-test + + + + + org.opensaml + opensaml-saml-api + ${opensaml.version} + + + org.opensaml + opensaml-saml-impl + ${opensaml.version} + + + net.shibboleth.utilities + java-support + ${shibboleth.xmlsupport.version} + + + org.opensaml + opensaml-xmlsec-api + ${opensaml.version} + + + javax.servlet + javax.servlet-api + ${servlet.version} + provided + + + + javax.servlet + jsp-api + ${jsp.api} + provided + + + + javax.servlet + jstl + ${jstl.version} + + + org.apache.taglibs + taglibs-standard-impl + ${apache.taglibs} + + + taglibs + standard + ${jstl.version} + + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + xalan + xalan + ${xalan.version} + + + org.opensaml + opensaml-xmlsec-impl + ${opensaml.version} + + + + org.apache.tomcat + jasper-el + ${jasper.version} + + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + com.hazelcast + hazelcast-wm + ${hazelcast.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + org.apache.struts + struts2-core + ${struts.version} + + + + com.ibm.icu + icu4j + ${icu4j.version} + + + + + junit + junit + ${junit.version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + xmlunit + xmlunit + ${xmlunit.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + + + + + + commons-collections + commons-collections + + + commons-io + commons-io + + + commons-lang + commons-lang + + + com.google.guava + guava + + + com.google.code.findbugs + jsr305 + + + + + junit + junit + + + hamcrest-core + org.hamcrest + + + + + org.hamcrest + hamcrest-all + + + org.mockito + mockito-core + + + hamcrest-core + org.hamcrest + + + + + xmlunit + xmlunit + + + + + + + + + com.orctom.mojo + was-maven-plugin + 1.0.8 + + c:/pgm/wlp + ${proj.name} + localhost + server01 + node01 + default_host + true + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + http://localhost:8080/manager/text + tomcat + /${proj.name} + admin + admin + + + + org.apache.maven.plugins + maven-war-plugin + ${war.plugin.version} + + + + ${project.basedir}/src/main/webapp/WEB-INF + true + WEB-INF + + **/web.xml + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${source.plugin.version} + + + attach-sources + verify + + jar-no-fork + + + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura.plugin.version} + + + html + xml + + + + + org.apache.maven.plugins + maven-resources-plugin + ${resources.plugin.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compile.plugin.version} + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + false + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.plugin.version} + + true + + + + + + ../EIDAS-Light-Commons + ../EIDAS-Commons + ../EIDAS-ConfigModule + ../EIDAS-Encryption + ../EIDAS-Metadata + ../EIDAS-SpecificCommunicationDefinition + + ../EIDAS-JCache-Dev + ../EIDAS-JCache-Dev-Node + + + + + NodeOnly + + true + + + ../EIDAS-SAMLEngine + ../EIDAS-UPDATER + ../EIDAS-Node + + + + DemoToolsOnly + + false + + + ../EIDAS-SimpleProtocol + ../EIDAS-SpecificProxyService + ../EIDAS-SpecificConnector + ../EIDAS-SP + ../EIDAS-IdP-1.0 + + + + nodeJcacheIgnite + + true + + + ../EIDAS-JCache-Ignite + ../EIDAS-JCache-Ignite-Node + + + + nodeJcacheHazelcast + + true + + + ../EIDAS-JCache-Hazelcast + ../EIDAS-JCache-Hazelcast-Node + + + + nodeJcacheDev + + true + + + ../EIDAS-JCache-Dev + ../EIDAS-JCache-Dev-Node + + + + specificCommunicationJcacheIgnite + + true + + + ../EIDAS-JCache-Ignite + ../EIDAS-JCache-Ignite-Specific-Communication + + + + specificCommunicationJcacheHazelcast + + false + + + ../EIDAS-JCache-Hazelcast + ../EIDAS-JCache-Hazelcast-Specific-Communication + + + + specificCommunicationJcacheDev + + false + + specificJar + + + + ../EIDAS-JCache-Dev + ../EIDAS-JCache-Dev-Specific-Communication + + + + Config + + false + + + ../EIDAS-Config + + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0-sources.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0-sources.jar new file mode 100644 index 00000000..c3dc8e3d Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0-sources.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.jar b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.jar new file mode 100644 index 00000000..9d26bcf5 Binary files /dev/null and b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.jar differ diff --git a/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.pom b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.pom new file mode 100644 index 00000000..fbf96ccf --- /dev/null +++ b/eidas_modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.3.0/eidas-specific-communication-definition-2.3.0.pom @@ -0,0 +1,113 @@ + + + 4.0.0 + eidas-specific-communication-definition + jar + eIDAS Specific Communication Definition + Defines and implements the communication protocol to be used between specific and node modules. + + + eu.eidas + eidas-parent + 2.3.0 + ../EIDAS-Parent/pom.xml + + + + org.springframework + spring-context + + + eu.eidas + eidas-commons + + + javax.servlet + javax.servlet-api + + + org.springframework + spring-test + test + + + commons-logging + commons-logging + test + + + eu.eidas + eidas-jcache-dev + test + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + + + specificCommunicationJcacheIgnite + + true + + + + eu.eidas + eidas-jcache-ignite-specific-communication + + + + + specificCommunicationJcacheHazelcast + + + eu.eidas + eidas-jcache-hazelcast-specific-communication + + + + + specificCommunicationJcacheProvidedImpl + + false + + + + specificCommunicationJcacheDev + + + + + + + + eu.eidas + eidas-jcache-dev-specific-communication + + + + + diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java index ea5ec25f..b38c3678 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java @@ -50,7 +50,7 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants; import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException; import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry; import at.gv.egiz.eaaf.core.api.data.EAAFConstants; -import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder; +import at.gv.egiz.eaaf.core.api.gui.ISpringMVCGUIFormBuilder; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; @@ -82,7 +82,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask { @Autowired eIDASAttributeRegistry attrRegistry; @Autowired ApplicationContext context; @Autowired ITransactionStorage transactionStore; - @Autowired IGUIFormBuilder guiBuilder; + @Autowired ISpringMVCGUIFormBuilder guiBuilder; @Override public void execute(ExecutionContext executionContext, @@ -181,7 +181,10 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask { authnRequestBuilder.citizenCountryCode(citizenCountryCode); //set relay state - authnRequestBuilder.relayState(pendingReq.getPendingRequestId()); + /*TODO: SecureToken PendingRequestId generates a validation exception in eIDASNode because + * eIDASNode implements limit on size for RelayState (80characaters) + */ + //authnRequestBuilder.relayState(pendingReq.getPendingRequestId()); //build and add requested attribute set ImmutableAttributeMap reqAttrMap = translateToEidasAttributes(attrRegistry.getAttributeSetFromConfiguration()); @@ -242,7 +245,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask { config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_VALUE, tokenBase64); - guiBuilder.build(request, response, config, "BKU-Selection form"); + guiBuilder.build(request, response, config, "Forward to eIDASNode form"); } diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html index 85e1d18f..186937d7 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html @@ -1,7 +1,11 @@ - + - +