From cde7d4a71cbd2ca0eda6d0b991834b195b3e6056 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 18 Sep 2020 08:01:34 +0200 Subject: update third-party libs and fix incompatibilities with new APIs --- .../connector/controller/MonitoringController.java | 2 +- .../connector/provider/PvpMetadataProvider.java | 33 ++---------------- connector_lib/pom.xml | 4 +++ .../gui/GuiBuilderConfigurationFactory.java | 10 ++++++ .../eidas/v2/test/SzrClientTestProduction.java | 4 +-- .../resources/SpringTest-context_basic_test.xml | 23 +++++++++++++ pom.xml | 39 ++++++++++++---------- 7 files changed, 63 insertions(+), 52 deletions(-) diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java index 633559de..aa45c836 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java @@ -48,8 +48,8 @@ import at.gv.egiz.eaaf.core.api.data.EaafConstants; import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP; import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage; import at.gv.egiz.eaaf.core.exceptions.EaafException; +import at.gv.egiz.eaaf.core.impl.http.IHttpClientFactory; import at.gv.egiz.eaaf.core.impl.utils.DomUtils; -import at.gv.egiz.eaaf.core.impl.utils.IHttpClientFactory; import at.gv.egiz.eaaf.core.impl.utils.Random; import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration; import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory; diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpMetadataProvider.java index 43f1740f..651b7b78 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpMetadataProvider.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpMetadataProvider.java @@ -25,10 +25,8 @@ package at.asitplus.eidas.specific.connector.provider; import java.io.IOException; import java.security.KeyStore; -import java.security.KeyStoreException; import java.security.Provider; import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +36,6 @@ import org.apache.commons.lang3.StringUtils; import org.opensaml.saml.metadata.resolver.MetadataResolver; import org.opensaml.saml.metadata.resolver.filter.MetadataFilter; import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain; -import org.opensaml.security.x509.BasicX509Credential; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +47,10 @@ import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration; import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException; import at.gv.egiz.eaaf.core.exceptions.EaafException; import at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreFactory; -import at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreUtils; import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration; import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration.KeyStoreType; import at.gv.egiz.eaaf.core.impl.data.Pair; -import at.gv.egiz.eaaf.core.impl.utils.IHttpClientFactory; +import at.gv.egiz.eaaf.core.impl.http.IHttpClientFactory; import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException; import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.AbstractChainingMetadataProvider; import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.PvpMetadataResolverFactory; @@ -131,7 +127,7 @@ public class PvpMetadataProvider extends AbstractChainingMetadataProvider { final List filterList = new ArrayList<>(); filterList.add(new SchemaValidationFilter(true)); filterList.add(new SimpleMetadataSignatureVerificationFilter( - getTrustedCertificates(keyStore.getFirst()), entityId)); + keyStore.getFirst(), entityId)); filterList.add(new PvpEntityCategoryFilter( basicConfig.getBasicConfigurationBoolean(MsEidasNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true))); @@ -177,29 +173,4 @@ public class PvpMetadataProvider extends AbstractChainingMetadataProvider { return "Service-provider chainging metadata provider"; } - - private List getTrustedCertificates(KeyStore trustStore) throws EaafConfigurationException { - try { - final List certs = - EaafKeyStoreUtils.readCertsFromKeyStore(trustStore); - if (certs.isEmpty()) { - log.warn("No trusted metadata-signing certificates in configuration"); - throw new EaafConfigurationException("module.eidasauth.02", - new Object[] { "No trusted metadata-signing certificates" }); - - } - - final List result = new ArrayList<>(); - for (final X509Certificate cert : certs) { - result.add(new BasicX509Credential(cert)); - - } - return result; - - } catch (final KeyStoreException e) { - throw new EaafConfigurationException("module.eidasauth.01", - new Object[] { "Trusted metadata-signing certificates", e.getMessage() }, e); - - } - } } diff --git a/connector_lib/pom.xml b/connector_lib/pom.xml index 52a6c32d..795096f9 100644 --- a/connector_lib/pom.xml +++ b/connector_lib/pom.xml @@ -23,6 +23,10 @@ at.gv.egiz.eaaf eaaf-core + + org.springframework + spring-webmvc + javax.servlet diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java index 9cef3db3..91713cd4 100644 --- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java +++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java @@ -26,6 +26,8 @@ package at.asitplus.eidas.specific.connector.gui; import java.net.MalformedURLException; import java.net.URI; +import javax.annotation.Nonnull; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; @@ -56,4 +58,12 @@ public class GuiBuilderConfigurationFactory implements IGuiBuilderConfigurationF MsEidasNodeConstants.TEMPLATE_HTML_PVP_POSTBINDING, null, resourceLoader); } + @Override + public IGuiBuilderConfiguration getDefaultIFrameParentHopGui(IRequest pendingReq, + @Nonnull String endpoint, @Nonnull String errorId) { + //TODO: implement if iFrame to parent hop is needed + throw new RuntimeException("Operation not supported yet."); + + } + } diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java index 0c080b32..2f6a989e 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java @@ -58,7 +58,7 @@ import szrservices.PersonInfoType; import szrservices.SZRException_Exception; import szrservices.TravelDocumentType; -@Ignore +//@Ignore @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("/SpringTest-context_basic_test.xml") public class SzrClientTestProduction { @@ -73,7 +73,7 @@ public class SzrClientTestProduction { private static final String familyName = "Mustermann"; // private static final String dateOfBirth = "1989-05-05"; private static final String dateOfBirth = "1989-05-04"; - private static final String eIDASeID = "IS/AT/1234sdgsdfg56789ABCDEF"; + private static final String eIDASeID = "IS/AT/1234ffgsdfg56789ABCDEF"; private static final String DUMMY_TARGET = EaafConstants.URN_PREFIX_CDID + "ZP"; diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml index f1f13391..0bb5d419 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml +++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml @@ -17,6 +17,29 @@ + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 50bdfaf4..8e0019d4 100644 --- a/pom.xml +++ b/pom.xml @@ -19,35 +19,38 @@ 0.3 0.4 - 1.1.0-SNAPSHOT - - 5.2.2.RELEASE + 1.1.8 + 5.2.9.RELEASE 3.0.11.RELEASE - 3.3.4 + 3.4.0 - 3.9 - 1.8 + 3.11 + 1.9 4.4 - 28.1-jre - 2.10.5 + 29.0-jre + 2.10.6 + 1.7.30 + + + 4.13 2.22.2 - 1.7.29 1.0.5 - - 0.8.5 - 3.1.0 - 3.12.0 - 3.1.12.2 + 0.8.6 + 3.1.1 + 3.13.0 + 4.0.4 ${project.build.directory}/thirdparty_licenses https://apps.egiz.gv.at/checkstyle/egiz_pmd_checks.xml + 3.8.1 + 2.8.1 1.20 - 3.2.0 + 3.3.0 @@ -204,7 +207,7 @@ junit junit - 4.12 + ${junit.version} test @@ -243,7 +246,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -275,7 +278,7 @@ org.codehaus.mojo versions-maven-plugin - 2.7 + ${versions-maven-plugin.version} -- cgit v1.2.3