From: r.bogacki Date: Mon, 19 Aug 2019 12:38:08 +0000 (+0200) Subject: Implement HTTPS calls into dcaedt_be X-Git-Tag: 1.3.3~8 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a0418bb757fbd35ac69131b1daaa6b0deeb1eb4b;p=sdc%2Fdcae-d%2Fdt-be-main.git 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 --- 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 c408393..0000000 Binary files a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore and /dev/null differ diff --git a/dcaedt_be/src/main/resources/org.onap.sdc.p12 b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 similarity index 100% rename from dcaedt_be/src/main/resources/org.onap.sdc.p12 rename to docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 diff --git a/dcaedt_be/src/main/resources/org.onap.sdc.trust.jks b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks similarity index 100% rename from dcaedt_be/src/main/resources/org.onap.sdc.trust.jks rename to docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore deleted file mode 100644 index c408393..0000000 Binary files a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore and /dev/null differ diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb index 5071b47..43919ed 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb @@ -22,16 +22,16 @@ end # Create Keystore -cookbook_file "/#{jetty_base}/etc/keystore" do - source "keystore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.p12" do + source "org.onap.sdc.p12" owner "jetty" group "jetty" mode 0755 end # Create Truststore -cookbook_file "/#{jetty_base}/etc/truststore" do - source "truststore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do + source "org.onap.sdc.trust.jks" owner "jetty" group "jetty" mode 0755 diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb index 9abac51..278fdea 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb @@ -42,10 +42,10 @@ jetty.ssl.port=<%= @https_port %> ## 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