From 5983d76f162aef34740a05ae4e78c7d9e2b3c20a Mon Sep 17 00:00:00 2001 From: TamasBakai Date: Wed, 10 Apr 2019 10:02:21 +0000 Subject: [PATCH] Updating certificates Issue-ID: DCAEGEN2-1300 Change-Id: I9ce457b69e5866e77a465fb040d196b8905ca274 Signed-off-by: TamasBakai --- datafile-app-server/config/cacerts | Bin 1403 -> 0 bytes datafile-app-server/config/dfc.jks.b64 | 38 +++++++++++++++++++++ datafile-app-server/config/ftp.jks.b64 | 15 ++++++++ datafile-app-server/config/ftpKey.jks | Bin 2579 -> 0 bytes datafile-app-server/config/keystore | Bin 2196 -> 0 bytes .../dpo/blueprints/k8s-datafile.yaml | 4 +-- datafile-app-server/src/main/docker/Dockerfile | 8 +++-- .../src/main/resources/datafile_endpoints.json | 4 +-- .../datafile/configuration/AppConfigTest.java | 7 ++-- .../configuration/CloudConfigParserTest.java | 10 +++--- .../src/test/resources/datafile_endpoints.json | 4 +-- docker-compose/docker-compose.yml | 4 +-- 12 files changed, 72 insertions(+), 22 deletions(-) delete mode 100644 datafile-app-server/config/cacerts create mode 100644 datafile-app-server/config/dfc.jks.b64 create mode 100644 datafile-app-server/config/ftp.jks.b64 delete mode 100644 datafile-app-server/config/ftpKey.jks delete mode 100644 datafile-app-server/config/keystore diff --git a/datafile-app-server/config/cacerts b/datafile-app-server/config/cacerts deleted file mode 100644 index 0cd28a923b41f8bc7264649f4a6aeff92ff95f38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1403 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 Y>gUf*;4OV diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml index 015d1805..e345cf8e 100644 --- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml +++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml @@ -98,9 +98,9 @@ node_templates: - concat: ["8433:", { get_input: host_port_secure}] properties: application_config: - dmaap.ftp.ftpesConfiguration.keyCert: "/config/ftpKey.jks" + dmaap.ftp.ftpesConfiguration.keyCert: "/config/dfc.jks" dmaap.ftp.ftpesConfiguration.keyPassword: "secret" - dmaap.ftp.ftpesConfiguration.trustedCA: "/config/cacerts" + dmaap.ftp.ftpesConfiguration.trustedCA: "/config/ftp.jks" dmaap.ftp.ftpesConfiguration.trustedCAPassword: "secret" dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks" dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass" diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile index 6ab30cc2..f39f1cb5 100644 --- a/datafile-app-server/src/main/docker/Dockerfile +++ b/datafile-app-server/src/main/docker/Dockerfile @@ -25,16 +25,18 @@ RUN mkdir -p /var/log/ONAP ADD /target/datafile-app-server.jar /opt/app/datafile/ ADD /config/application.yaml /opt/app/datafile/config/ -ADD /config/cacerts /opt/app/datafile/config/ +ADD /config/dfc.jks.b64 /opt/app/datafile/config/ ADD /config/datafile_endpoints.json /opt/app/datafile/config/ -ADD /config/ftpKey.jks /opt/app/datafile/config/ -ADD /config/keystore /opt/app/datafile/config/ +ADD /config/ftp.jks.b64 /opt/app/datafile/config/ EXPOSE 8100 8433 RUN addgroup -S onap && adduser -S datafile -G onap RUN chown -R datafile:onap /opt/app/datafile RUN chown -R datafile:onap /var/log/ONAP +RUN base64 -d /opt/app/datafile/config/dfc.jks.b64 > /opt/app/datafile/config/dfc.jks && base64 -d /opt/app/datafile/config/ftp.jks.b64 > /opt/app/datafile/config/ftp.jks +RUN chown -R root:root /opt/app/datafile/config/* +RUN chmod -R 755 /opt/app/datafile/config/ USER datafile diff --git a/datafile-app-server/src/main/resources/datafile_endpoints.json b/datafile-app-server/src/main/resources/datafile_endpoints.json index 0cf41887..d864c11d 100644 --- a/datafile-app-server/src/main/resources/datafile_endpoints.json +++ b/datafile-app-server/src/main/resources/datafile_endpoints.json @@ -26,9 +26,9 @@ }, "ftp": { "ftpesConfiguration": { - "keyCert": "config/ftpKey.jks", + "keyCert": "config/dfc.jks", "keyPassword": "secret", - "trustedCA": "config/cacerts", + "trustedCA": "config/ftp.jks", "trustedCAPassword": "secret" } } diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java index 2c136304..1847e3b8 100644 --- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java +++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java @@ -24,17 +24,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Objects; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -186,9 +183,9 @@ class AppConfigTest { dmaapConfigs.add("dmaapProducerConfiguration", dmaapProducerConfigData); JsonObject ftpesConfigData = new JsonObject(); - ftpesConfigData.addProperty("keyCert", "config/ftpKey.jks"); + ftpesConfigData.addProperty("keyCert", "config/dfc.jks"); ftpesConfigData.addProperty("keyPassword", "secret"); - ftpesConfigData.addProperty("trustedCA", "config/cacerts"); + ftpesConfigData.addProperty("trustedCA", "config/ftp.jks"); ftpesConfigData.addProperty("trustedCAPassword", "secret"); JsonObject security = new JsonObject(); diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java index b67fac23..1adb3709 100644 --- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java +++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java @@ -17,9 +17,7 @@ package org.onap.dcaegen2.collectors.datafile.configuration; import static org.assertj.core.api.Assertions.assertThat; - import com.google.gson.JsonObject; - import org.junit.jupiter.api.Test; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapConsumerConfiguration; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration; @@ -66,9 +64,9 @@ class CloudConfigParserTest { private static final ImmutableFtpesConfig CORRECT_FTPES_CONFIGURATION = // new ImmutableFtpesConfig.Builder() // - .keyCert("/config/ftpKey.jks") // + .keyCert("/config/dfc.jks") // .keyPassword("secret") // - .trustedCA("config/cacerts") // + .trustedCA("config/ftp.jks") // .trustedCAPassword("secret") // .build(); @@ -119,9 +117,9 @@ class CloudConfigParserTest { config.addProperty("dmaap.dmaapProducerConfiguration.dmaapPortNumber", 3907); config.addProperty("dmaap.dmaapProducerConfiguration.dmaapUserName", "dradmin"); config.addProperty("dmaap.dmaapProducerConfiguration.dmaapUserPassword", "dradmin"); - config.addProperty("dmaap.ftpesConfig.keyCert", "/config/ftpKey.jks"); + config.addProperty("dmaap.ftpesConfig.keyCert", "/config/dfc.jks"); config.addProperty("dmaap.ftpesConfig.keyPassword", "secret"); - config.addProperty("dmaap.ftpesConfig.trustedCA", "config/cacerts"); + config.addProperty("dmaap.ftpesConfig.trustedCA", "config/ftp.jks"); config.addProperty("dmaap.ftpesConfig.trustedCAPassword", "secret"); config.addProperty("dmaap.security.trustStorePath", "trustStorePath"); diff --git a/datafile-app-server/src/test/resources/datafile_endpoints.json b/datafile-app-server/src/test/resources/datafile_endpoints.json index a9545f40..8cf3224a 100644 --- a/datafile-app-server/src/test/resources/datafile_endpoints.json +++ b/datafile-app-server/src/test/resources/datafile_endpoints.json @@ -26,9 +26,9 @@ }, "ftp": { "ftpesConfiguration": { - "keyCert": "/config/ftpKey.jks", + "keyCert": "/config/dfc.jks", "keyPassword": "secret", - "trustedCA": "/config/ftpKey.jks", + "trustedCA": "/config/ftp.jks", "trustedCAPassword": "secret" } }, diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 481072f1..010e7468 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -21,9 +21,9 @@ services: --dmaap.dmaapProducerConfiguration.dmaapUserName=dradmin --dmaap.dmaapProducerConfiguration.dmaapUserPassword=dradmin --dmaap.dmaapProducerConfiguration.dmaapContentType=application/octet-stream - --dmaap.ftpesConfig.keyCert=config/ftpKey.jks + --dmaap.ftpesConfig.keyCert=config/dfc.jks --dmaap.ftpesConfig.keyPassword=secret - --dmaap.ftpesConfig.trustedCA=config/cacerts + --dmaap.ftpesConfig.trustedCA=config/ftp.jks --dmaap.ftpesConfig.trustedCAPassword=secret entrypoint: - java -- 2.16.6