From 59b99324415863308bd499d0589b4ba7a425ba9e Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Wed, 7 Apr 2021 12:48:39 +0000 Subject: Remove trust all for BasicAuthRestClientService following global requirement expected in Istanbul, which forbids disabling host name verification Issue-ID: CCSDK-3245 Signed-off-by: Claudio D. Gasparini Change-Id: I89c37a94cb3999a8f1813d3fc33958421b183de1 --- .../rest/service/BasicAuthRestClientService.kt | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'ms/blueprintsprocessor/modules') diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BasicAuthRestClientService.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BasicAuthRestClientService.kt index 5ab848893..be9b849f6 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BasicAuthRestClientService.kt +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BasicAuthRestClientService.kt @@ -16,15 +16,8 @@ package org.onap.ccsdk.cds.blueprintsprocessor.rest.service -import org.apache.http.conn.ssl.NoopHostnameVerifier -import org.apache.http.conn.ssl.SSLConnectionSocketFactory -import org.apache.http.conn.ssl.TrustAllStrategy -import org.apache.http.impl.client.CloseableHttpClient -import org.apache.http.impl.client.HttpClients import org.apache.http.message.BasicHeader -import org.apache.http.ssl.SSLContextBuilder import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties -import org.onap.ccsdk.cds.blueprintsprocessor.rest.utils.WebClientUtils import org.springframework.http.HttpHeaders import org.springframework.http.MediaType import java.net.URI @@ -55,17 +48,6 @@ class BasicAuthRestClientService( return uri.resolve(uri).toString() } - override fun httpClient(): CloseableHttpClient { - val sslContext = SSLContextBuilder.create() - - sslContext.loadTrustMaterial(TrustAllStrategy.INSTANCE) - val csf = SSLConnectionSocketFactory(sslContext.build(), NoopHostnameVerifier()) - return HttpClients.custom() - .addInterceptorFirst(WebClientUtils.logRequest()) - .addInterceptorLast(WebClientUtils.logResponse()) - .setSSLSocketFactory(csf).build() - } - override fun convertToBasicHeaders(headers: Map): Array { val customHeaders: MutableMap = headers.toMutableMap() -- cgit 1.2.3-korg