From d265e185c3868202d44690d76e1b578f19b5148f Mon Sep 17 00:00:00 2001 From: "r.bogacki" Date: Wed, 14 Aug 2019 09:04:26 +0200 Subject: HTTPS calls for catalog-be Implement HTTPS calls into catalog-be -Added p12 keystore certificate. -Updated application configuration. -Added trust-store. Issue-ID: SDC-2501 Signed-off-by: Robert Bogacki Change-Id: Iecdff1010f763489395e9d67d3a0cecd22d09c88 --- .../cookbooks/sdc-catalog-be/attributes/default.rb | 8 ++++---- .../cookbooks/sdc-catalog-be/files/default/keystore | Bin 4255 -> 0 bytes .../sdc-catalog-be/files/default/org.onap.sdc.p12 | Bin 0 -> 4051 bytes .../sdc-catalog-be/files/default/org.onap.sdc.trust.jks | Bin 0 -> 1413 bytes .../cookbooks/sdc-catalog-be/files/default/truststore | Bin 4255 -> 0 bytes .../sdc-catalog-be/recipes/BE_3_locate_keystore.rb | 8 ++++---- .../sdc-catalog-be/templates/default/ssl-ini.erb | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore create mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 create mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks delete mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/truststore (limited to 'catalog-be') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 763db8f5a4..af1726a977 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -5,9 +5,9 @@ default['FE'][:http_port] = 8181 default['FE'][:https_port] = 9443 default['disableHttp'] = true default['cassandra'][:truststore_password] = "Aa123456" -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" #Reserved for DCAE backend default['DCAE']['BE'][:http_port] = 8082 @@ -42,4 +42,4 @@ default['DMAAP']['active'] = false default['ECompP']['cipher_key'] = "AGLDdG4D04BKm2IxIWEr8o==" default['ECompP']['portal_user'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" -default['ECompP']['portal_app_name'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" \ No newline at end of file +default['ECompP']['portal_app_name'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore deleted file mode 100644 index c4083931dc..0000000000 Binary files a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore and /dev/null differ diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 new file mode 100644 index 0000000000..ee000dc749 Binary files /dev/null and b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 differ diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks new file mode 100644 index 0000000000..342c4f2ad7 Binary files /dev/null and b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks differ diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/truststore b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/truststore deleted file mode 100644 index c4083931dc..0000000000 Binary files a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/truststore and /dev/null differ diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_locate_keystore.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_locate_keystore.rb index e540b34d26..cb2ffc7154 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_locate_keystore.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_locate_keystore.rb @@ -7,15 +7,15 @@ directory "Jetty_etcdir_creation" do action :create end -cookbook_file "#{ENV['JETTY_BASE']}/etc/keystore" do - source "keystore" +cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.p12" do + source "org.onap.sdc.p12" owner "jetty" group "jetty" mode 0755 end -cookbook_file "#{ENV['JETTY_BASE']}/etc/truststore" do - source "truststore" +cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.trust.jks" do + source "org.onap.sdc.trust.jks" owner "jetty" group "jetty" mode 0755 diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb index 1f1ff5d394..278fdea2ae 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/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 -- cgit 1.2.3-korg