From c6c0077ac3db6190d1f364360de5af17e9fcd08b Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Mon, 22 Jul 2019 14:28:09 +0000 Subject: [PATCH] Implement TLS for calls into VNFM adapter Issue-ID: SO-2143 Change-Id: I2fcacab7aebc9a22b952d881b0bf2404e1638b37 Signed-off-by: MichaelMorris --- .../vnfm/VnfmServiceProviderConfiguration.java | 8 +++--- .../src/main/resources/application.yaml | 7 ++++- .../src/main/resources/so-vnfm-adapter.p12 | Bin 0 -> 4079 bytes .../{application-test.yaml => application.yaml} | 14 ++++++++++ .../adapter/vnfm/tasks/Constants.java | 2 +- .../simulator/services/OperationProgressor.java | 19 +++++++++++++ .../src/main/resources/so-vnfm-adapter.crt.pem | 30 +++++++++++++++++++++ 7 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/so-vnfm-adapter.p12 rename adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/resources/{application-test.yaml => application.yaml} (79%) create mode 100644 vnfm-simulator/vnfm-service/src/main/resources/so-vnfm-adapter.crt.pem diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java index 3342e0d054..ab631837db 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java @@ -63,9 +63,9 @@ public class VnfmServiceProviderConfiguration { private static final Logger logger = LoggerFactory.getLogger(VnfmServiceProviderConfiguration.class); - @Value("${http.client.ssl.trust-store}") + @Value("${http.client.ssl.trust-store:#{null}}") private Resource keyStore; - @Value("${http.client.ssl.trust-store-password}") + @Value("${http.client.ssl.trust-store-password:#{null}}") private String keyStorePassword; @Bean(name = "vnfmServiceProvider") @@ -77,7 +77,9 @@ public class VnfmServiceProviderConfiguration { private HttpRestServiceProvider getHttpRestServiceProvider(final RestTemplate restTemplate, final HttpHeadersProvider httpHeadersProvider) { setGsonMessageConverter(restTemplate); - setTrustStore(restTemplate); + if (keyStore != null) { + setTrustStore(restTemplate); + } removeSpringClientFilter(restTemplate); return new HttpRestServiceProviderImpl(restTemplate, httpHeadersProvider); } diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/application.yaml b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/application.yaml index 0bd63dffa9..4434d2edd9 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/application.yaml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/application.yaml @@ -34,6 +34,11 @@ server: port: 9092 tomcat: max-threads: 50 + ssl: + key-alias: so@so.onap.org + key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L' + key-store: classpath:so-vnfm-adapter.p12 + key-store-type: PKCS12 mso: key: 07a7159d3bf51a0e53be7a8f89699be7 @@ -50,7 +55,7 @@ sdc: endpoint: http://sdc.onap/1234A vnfmadapter: - endpoint: http://so-vnfm-adapter.onap:9092 + endpoint: https://so-vnfm-adapter.onap:9092 #Actuator management: diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/so-vnfm-adapter.p12 b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/resources/so-vnfm-adapter.p12 new file mode 100644 index 0000000000000000000000000000000000000000..ae4fddc6846bdb4d6b0c05d925123526ba05ca99 GIT binary patch literal 4079 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