From 69b67ba6e2775ea9c9447014085b61d9d5b6e6b9 Mon Sep 17 00:00:00 2001 From: Marten Muru Date: Wed, 2 Nov 2022 21:27:58 +0200 Subject: [PATCH 1/2] SIVA-327 Fix dd4j keystore location --- .../TimemarkContainerValidationServiceConfiguration.java | 6 +++++- .../ee/openeid/tsl/keystore/DSSKeyStoreFactoryBean.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/validation-services-parent/timemark-container-validation-service/src/main/java/ee/openeid/validation/service/timemark/configuration/TimemarkContainerValidationServiceConfiguration.java b/validation-services-parent/timemark-container-validation-service/src/main/java/ee/openeid/validation/service/timemark/configuration/TimemarkContainerValidationServiceConfiguration.java index 81d1cd5a7..cf419e68f 100644 --- a/validation-services-parent/timemark-container-validation-service/src/main/java/ee/openeid/validation/service/timemark/configuration/TimemarkContainerValidationServiceConfiguration.java +++ b/validation-services-parent/timemark-container-validation-service/src/main/java/ee/openeid/validation/service/timemark/configuration/TimemarkContainerValidationServiceConfiguration.java @@ -19,6 +19,7 @@ import ee.openeid.siva.validation.service.signature.policy.ConstraintLoadingSignaturePolicyService; import ee.openeid.tsl.configuration.TSLLoaderConfigurationProperties; import ee.openeid.tsl.configuration.TSLValidationKeystoreProperties; +import ee.openeid.tsl.keystore.DSSKeyStoreFactoryBean; import org.apache.commons.lang3.StringUtils; import org.digidoc4j.Configuration; import org.digidoc4j.ExternalConnectionType; @@ -30,6 +31,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; +import java.io.File; + @SpringBootConfiguration @EnableAutoConfiguration @EnableConfigurationProperties({ @@ -81,7 +84,8 @@ private Configuration createConfiguration(Configuration.Mode mode) { configuration.setSslTruststoreTypeFor(ExternalConnectionType.TSL, tslLoaderConfigurationProperties.getSslTruststoreType()); configuration.setLotlLocation(tslLoaderConfigurationProperties.getUrl()); configuration.setLotlPivotSupportEnabled(tslLoaderConfigurationProperties.isLotlPivotSupportEnabled()); - configuration.setLotlTruststorePath(tslValidationKeystoreProperties.getFilename()); + String sivaLotlTruststorePath = DSSKeyStoreFactoryBean.getDssDataFolder() + File.separatorChar + tslValidationKeystoreProperties.getFilename(); + configuration.setLotlTruststorePath(sivaLotlTruststorePath); configuration.setLotlTruststorePassword(tslValidationKeystoreProperties.getPassword()); configuration.setLotlTruststoreType(tslValidationKeystoreProperties.getType()); return configuration; diff --git a/validation-services-parent/tsl-loader/src/main/java/ee/openeid/tsl/keystore/DSSKeyStoreFactoryBean.java b/validation-services-parent/tsl-loader/src/main/java/ee/openeid/tsl/keystore/DSSKeyStoreFactoryBean.java index 8c5e24f8f..de94d8e01 100644 --- a/validation-services-parent/tsl-loader/src/main/java/ee/openeid/tsl/keystore/DSSKeyStoreFactoryBean.java +++ b/validation-services-parent/tsl-loader/src/main/java/ee/openeid/tsl/keystore/DSSKeyStoreFactoryBean.java @@ -31,7 +31,7 @@ public class DSSKeyStoreFactoryBean extends AbstractFactoryBean { private static final Logger KEY_STORE_LOGGER = LoggerFactory.getLogger(DSSKeyStoreFactoryBean.class); - private static final String ENVIRONMENT_VARIABLE_DSS_DATA_FOLDER = "DSS_DATA_FOLDER"; + public static final String ENVIRONMENT_VARIABLE_DSS_DATA_FOLDER = "DSS_DATA_FOLDER"; private String keyStoreType; private String keyStoreFilename; @@ -88,7 +88,7 @@ private File getKeyStoreFile() { return keystoreFile; } - private String getDssDataFolder() { + public static String getDssDataFolder() { String dssDataFolder = System.getProperty(ENVIRONMENT_VARIABLE_DSS_DATA_FOLDER); if (StringUtils.isNotEmpty(dssDataFolder)) { KEY_STORE_LOGGER.info(ENVIRONMENT_VARIABLE_DSS_DATA_FOLDER + " found as system property : " + dssDataFolder); From ca4a8a34265f46a55e4fc972f0059b2ab3c14986 Mon Sep 17 00:00:00 2001 From: Marten Muru Date: Fri, 4 Nov 2022 01:38:44 +0200 Subject: [PATCH 2/2] SIVA-288 Update version number to 3.6.0 --- pom.xml | 2 +- siva-parent/pom.xml | 4 ++-- siva-parent/siva-distribution/pom.xml | 2 +- siva-parent/siva-monitoring/pom.xml | 2 +- siva-parent/siva-sample-application/pom.xml | 2 +- siva-parent/siva-signature-service/pom.xml | 2 +- siva-parent/siva-statistics/pom.xml | 2 +- siva-parent/siva-test/pom.xml | 2 +- siva-parent/siva-validation-proxy/pom.xml | 2 +- siva-parent/siva-webapp/pom.xml | 2 +- validation-services-parent/generic-validation-service/pom.xml | 2 +- validation-services-parent/pom.xml | 2 +- .../timemark-container-validation-service/pom.xml | 2 +- .../timestamptoken-validation-service/pom.xml | 2 +- validation-services-parent/tsl-loader/pom.xml | 2 +- validation-services-parent/validation-commons/pom.xml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index bbcba4530..662e29749 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ ee.openid.siva siva - 3.5.4 + 3.6.0 pom SiVa Digitally signed documents validation service https://github.com/open-eid/SiVa diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml index 85d17b3b4..b0ba10e48 100644 --- a/siva-parent/pom.xml +++ b/siva-parent/pom.xml @@ -19,14 +19,14 @@ siva ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 siva-parent pom SiVa webapp and other core modules - 3.5.4 + 3.6.0 siva-validation-proxy diff --git a/siva-parent/siva-distribution/pom.xml b/siva-parent/siva-distribution/pom.xml index 90393ce63..b670ab60b 100644 --- a/siva-parent/siva-distribution/pom.xml +++ b/siva-parent/siva-distribution/pom.xml @@ -20,7 +20,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-monitoring/pom.xml b/siva-parent/siva-monitoring/pom.xml index 962918025..bdcdcfae6 100644 --- a/siva-parent/siva-monitoring/pom.xml +++ b/siva-parent/siva-monitoring/pom.xml @@ -19,7 +19,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-sample-application/pom.xml b/siva-parent/siva-sample-application/pom.xml index f89f62e92..64a511e20 100644 --- a/siva-parent/siva-sample-application/pom.xml +++ b/siva-parent/siva-sample-application/pom.xml @@ -18,7 +18,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-signature-service/pom.xml b/siva-parent/siva-signature-service/pom.xml index 6fd0a4da5..365d25c31 100644 --- a/siva-parent/siva-signature-service/pom.xml +++ b/siva-parent/siva-signature-service/pom.xml @@ -19,7 +19,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-statistics/pom.xml b/siva-parent/siva-statistics/pom.xml index 8f7cc5f39..e516a6798 100644 --- a/siva-parent/siva-statistics/pom.xml +++ b/siva-parent/siva-statistics/pom.xml @@ -19,7 +19,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-test/pom.xml b/siva-parent/siva-test/pom.xml index 5b415467a..cfebe8a82 100644 --- a/siva-parent/siva-test/pom.xml +++ b/siva-parent/siva-test/pom.xml @@ -19,7 +19,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-validation-proxy/pom.xml b/siva-parent/siva-validation-proxy/pom.xml index 6e9a39311..f7f102102 100644 --- a/siva-parent/siva-validation-proxy/pom.xml +++ b/siva-parent/siva-validation-proxy/pom.xml @@ -18,7 +18,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/siva-parent/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml index 7623b99d4..aaf5e2e1e 100644 --- a/siva-parent/siva-webapp/pom.xml +++ b/siva-parent/siva-webapp/pom.xml @@ -19,7 +19,7 @@ siva-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/validation-services-parent/generic-validation-service/pom.xml b/validation-services-parent/generic-validation-service/pom.xml index 0b0644585..d0b0169b9 100644 --- a/validation-services-parent/generic-validation-service/pom.xml +++ b/validation-services-parent/generic-validation-service/pom.xml @@ -19,7 +19,7 @@ validation-services-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/validation-services-parent/pom.xml b/validation-services-parent/pom.xml index 516677341..92d4eb292 100644 --- a/validation-services-parent/pom.xml +++ b/validation-services-parent/pom.xml @@ -19,7 +19,7 @@ siva ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 pom diff --git a/validation-services-parent/timemark-container-validation-service/pom.xml b/validation-services-parent/timemark-container-validation-service/pom.xml index 7111bb646..01001d47a 100644 --- a/validation-services-parent/timemark-container-validation-service/pom.xml +++ b/validation-services-parent/timemark-container-validation-service/pom.xml @@ -18,7 +18,7 @@ validation-services-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/validation-services-parent/timestamptoken-validation-service/pom.xml b/validation-services-parent/timestamptoken-validation-service/pom.xml index a4f742a76..b9debb35b 100644 --- a/validation-services-parent/timestamptoken-validation-service/pom.xml +++ b/validation-services-parent/timestamptoken-validation-service/pom.xml @@ -19,7 +19,7 @@ validation-services-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/validation-services-parent/tsl-loader/pom.xml b/validation-services-parent/tsl-loader/pom.xml index 2b2c443c0..0e8f618e0 100644 --- a/validation-services-parent/tsl-loader/pom.xml +++ b/validation-services-parent/tsl-loader/pom.xml @@ -19,7 +19,7 @@ validation-services-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0 diff --git a/validation-services-parent/validation-commons/pom.xml b/validation-services-parent/validation-commons/pom.xml index 6b41e0e07..eeec2513c 100644 --- a/validation-services-parent/validation-commons/pom.xml +++ b/validation-services-parent/validation-commons/pom.xml @@ -19,7 +19,7 @@ validation-services-parent ee.openid.siva - 3.5.4 + 3.6.0 4.0.0