Repository: camel Updated Branches: refs/heads/master 20faf979c -> bdf9f5dad
CAMEL-10764 The use of BrowserCompatHostname... ...Verifier is deprecated The BrowserCompatHostnameVerifier has been deprecated in HttpClient version 4.4, instead DefaultHostnameVerifier should be used. The commit also changes the type of `x509HostnameVerifier` from `X509HostnameVerifier` to `HostnameVerifier`. Due to HTTPCLIENT-1802[1] version of HttpClient was upgraded to 4.5.3 from 4.5.2. Compatibility note: this changes the getter `getX509HostnameVerifier` from `X509HostnameVerifier` to `HostnameVerifier` so any client code using this getter needs to be changed. For the setter `setX509HostnameVerifier` this is not an issue as the deprecated `X509HostnameVerifier` extends from `HostnameVerifier`. [1] https://issues.apache.org/jira/browse/HTTPCLIENT-1802 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcc99170 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcc99170 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcc99170 Branch: refs/heads/master Commit: bcc99170cbe81031dbd4fa7b32ce36c0e5a60ba8 Parents: 20faf97 Author: Zoran Regvart <zo...@regvart.com> Authored: Mon Jan 30 10:13:58 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jan 30 15:56:24 2017 +0100 ---------------------------------------------------------------------- .../camel/component/http4/HttpComponent.java | 23 ++++++++++---------- parent/pom.xml | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bcc99170/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java index 89a5bea..b6193fa 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; +import javax.net.ssl.HostnameVerifier; + import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.Producer; @@ -51,13 +53,12 @@ import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier; +import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContexts; -import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; +import org.apache.http.ssl.SSLContexts; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,7 +81,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa @Metadata(label = "security") protected SSLContextParameters sslContextParameters; @Metadata(label = "security") - protected X509HostnameVerifier x509HostnameVerifier = new BrowserCompatHostnameVerifier(); + protected HostnameVerifier x509HostnameVerifier = new DefaultHostnameVerifier(); @Metadata(label = "producer") protected CookieStore cookieStore; @@ -277,8 +278,8 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa return clientConnectionManager; } - final X509HostnameVerifier resolvedHostnameVerifier = resolveAndRemoveReferenceParameter(parameters, "x509HostnameVerifier", X509HostnameVerifier.class); - final X509HostnameVerifier hostnameVerifier = Optional.ofNullable(resolvedHostnameVerifier).orElse(x509HostnameVerifier); + final HostnameVerifier resolvedHostnameVerifier = resolveAndRemoveReferenceParameter(parameters, "x509HostnameVerifier", HostnameVerifier.class); + final HostnameVerifier hostnameVerifier = Optional.ofNullable(resolvedHostnameVerifier).orElse(x509HostnameVerifier); // need to check the parameters of maxTotalConnections and connectionsPerRoute final int maxTotalConnections = getAndRemoveParameter(parameters, "maxTotalConnections", int.class, 0); @@ -307,7 +308,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa return clientBuilder; } - protected Registry<ConnectionSocketFactory> createConnectionRegistry(X509HostnameVerifier x509HostnameVerifier, SSLContextParameters sslContextParams) + protected Registry<ConnectionSocketFactory> createConnectionRegistry(HostnameVerifier x509HostnameVerifier, SSLContextParameters sslContextParams) throws GeneralSecurityException, IOException { // create the default connection registry to use RegistryBuilder<ConnectionSocketFactory> builder = RegistryBuilder.<ConnectionSocketFactory>create(); @@ -465,15 +466,15 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa this.sslContextParameters = sslContextParameters; } - public X509HostnameVerifier getX509HostnameVerifier() { + public HostnameVerifier getX509HostnameVerifier() { return x509HostnameVerifier; } /** - * To use a custom X509HostnameVerifier such as org.apache.http.conn.ssl.StrictHostnameVerifier - * or org.apache.http.conn.ssl.AllowAllHostnameVerifier. + * To use a custom X509HostnameVerifier such as {@link DefaultHostnameVerifier} + * or {@link org.apache.http.conn.ssl.NoopHostnameVerifier}. */ - public void setX509HostnameVerifier(X509HostnameVerifier x509HostnameVerifier) { + public void setX509HostnameVerifier(HostnameVerifier x509HostnameVerifier) { this.x509HostnameVerifier = x509HostnameVerifier; } http://git-wip-us.apache.org/repos/asf/camel/blob/bcc99170/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8e5118d..8806258 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -261,7 +261,7 @@ <htrace-version>3.1.0-incubating</htrace-version> <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.4.4</httpcore4-version> - <httpclient4-version>4.5.2</httpclient4-version> + <httpclient4-version>4.5.3</httpclient4-version> <httpasyncclient-version>4.1.2</httpasyncclient-version> <httpclient-version>3.1</httpclient-version> <hystrix-version>1.5.9</hystrix-version>
