From a0418bb757fbd35ac69131b1daaa6b0deeb1eb4b Mon Sep 17 00:00:00 2001 From: "r.bogacki" Date: Mon, 19 Aug 2019 14:38:08 +0200 Subject: [PATCH] Implement HTTPS calls into dcaedt_be Implemented HTTPS calls into dcaedt_be -Added p12 keystore certificate. -Updated application configuration. -Added trust-store. Issue-ID: SDC-2477 Signed-off-by: Robert Bogacki Change-Id: I51a5e4d6d93dc9391eb25519ed382291de5895eb --- .../webapp/WEB-INF/config/dcae-be/application.properties | 6 ------ .../cookbooks/Deploy-DCAE/attributes/default.rb | 6 +++--- .../cookbooks/Deploy-DCAE/files/default/keystore | Bin 4255 -> 0 bytes .../Deploy-DCAE/files/default}/org.onap.sdc.p12 | Bin .../Deploy-DCAE/files/default}/org.onap.sdc.trust.jks | Bin .../cookbooks/Deploy-DCAE/files/default/truststore | Bin 4255 -> 0 bytes .../cookbooks/Deploy-DCAE/recipes/jetty_setup.rb | 8 ++++---- .../cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb | 4 ++-- 8 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore rename {dcaedt_be/src/main/resources => docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default}/org.onap.sdc.p12 (100%) rename {dcaedt_be/src/main/resources => docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default}/org.onap.sdc.trust.jks (100%) delete mode 100644 docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore diff --git a/dcaedt_be/src/main/webapp/WEB-INF/config/dcae-be/application.properties b/dcaedt_be/src/main/webapp/WEB-INF/config/dcae-be/application.properties index f299fbb..2bb725d 100644 --- a/dcaedt_be/src/main/webapp/WEB-INF/config/dcae-be/application.properties +++ b/dcaedt_be/src/main/webapp/WEB-INF/config/dcae-be/application.properties @@ -1,11 +1,5 @@ # Configure the server to run with SSL/TLS and using HTTPS server.port=8446 -server.ssl.key-store=classpath:org.onap.sdc.p12 -server.ssl.key-store-password=rTIS;B4kM]2GHcNK2c3B4&Ng - -http.client.ssl.trust-store=classpath:org.onap.sdc.trust.jks -http.client.ssl.trust-store-password=Y,f975ZNJfVZhV*{+Y[}pA?0 - server.contextPath=/ ##ScheduleTimer scheduled.timer.value=5000 diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb index 19d401e..921fde1 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb @@ -13,9 +13,9 @@ default['SDC']['BE']['http_port'] = 8080 default['SDC']['BE']['https_port'] = 8443 default['DCAE']['TOSCA_LAB']['https_port'] = 8085 -default['jetty']['keystore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty']['keymanager_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty']['truststore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" +default['jetty']['keystore_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng" +default['jetty']['keymanager_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng" +default['jetty']['truststore_pwd'] = "Y,f975ZNJfVZhV*{+Y[}pA?0" default['disableHttp'] = true diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore deleted file mode 100644 index c4083931dcdcc3783a781ab103c72a9f6843d77b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4255 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 ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore file path (relative to $jetty.base) -#jetty.sslContext.keyStorePath=etc/keystore +jetty.sslContext.keyStorePath=etc/org.onap.sdc.p12 ## Truststore file path (relative to $jetty.base) -#jetty.sslContext.trustStorePath=etc/truststore +jetty.sslContext.trustStorePath=etc/org.onap.sdc.trust.jks ## Keystore password # jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -- 2.16.6