diff options
author | Andreas Eriksen <andreer@yahooinc.com> | 2023-01-06 17:16:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-06 17:16:35 +0100 |
commit | 4bb0999694a314b8daebe179db39c1fe48cca21d (patch) | |
tree | b5e59f7141c7b38c9cce3dfb4662859c546ca8d7 /vespa-athenz | |
parent | 58889b4e6d3f220c1c52907f37a57fc5c4e53060 (diff) |
Revert "Ensure that HTTPS clients only use allowed ciphers and protocol versions" (#25436)
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/pom.xml | 6 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 8a649154960..f1e6738bdb9 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -121,12 +121,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>http-utils</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> <dependency> <!-- needed by auth-core --> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-impl</artifactId> diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java index f9b422774b4..a49ea166f2d 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.athenz.client.common; -import ai.vespa.util.http.hc4.SslConnectionSocketFactory; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -13,6 +12,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.ResponseHandler; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; @@ -103,7 +103,7 @@ public abstract class ClientBase implements AutoCloseable { return HttpClientBuilder.create() .setRetryHandler(new DefaultHttpRequestRetryHandler(3, /*requestSentRetryEnabled*/true)) .setUserAgent(userAgent) - .setSSLSocketFactory(SslConnectionSocketFactory.of(new ServiceIdentitySslSocketFactory(sslContextSupplier), hostnameVerifier)) + .setSSLSocketFactory(new SSLConnectionSocketFactory(new ServiceIdentitySslSocketFactory(sslContextSupplier), hostnameVerifier)) .setMaxConnPerRoute(8) .setDefaultRequestConfig(RequestConfig.custom() .setConnectTimeout((int) Duration.ofSeconds(10).toMillis()) |