From 4cda33bdaa3e640129228b807bb4b666e5d29768 Mon Sep 17 00:00:00 2001 From: luyuncheng Date: Wed, 15 Nov 2023 23:18:03 +0800 Subject: [PATCH 1/2] Allow All hostname when ssl set insecure Allow All hostname when ssl set insecure --- .../opensearch/sink/DefaultRestClientFactory.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java b/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java index 44d2060..866b97f 100644 --- a/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java +++ b/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java @@ -24,6 +24,7 @@ import org.apache.http.conn.ssl.TrustAllStrategy; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; +import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy; import org.apache.http.ssl.SSLContexts; import org.opensearch.client.RestClientBuilder; @@ -85,8 +86,11 @@ protected void configureHttpClientBuilder( if (networkClientConfig.isAllowInsecure().orElse(false)) { try { - httpClientBuilder.setSSLContext( - SSLContexts.custom().loadTrustMaterial(new TrustAllStrategy()).build()); + httpClientBuilder + .setSSLContext( + SSLContexts.custom().loadTrustMaterial(new TrustAllStrategy()).build()) + .setSSLHostnameVerifier( + SSLIOSessionStrategy.ALLOW_ALL_HOSTNAME_VERIFIER); } catch (final NoSuchAlgorithmException | KeyStoreException | KeyManagementException ex) { From c13768e75cbe1167a89a2553f82681817d919045 Mon Sep 17 00:00:00 2001 From: luyuncheng Date: Thu, 16 Nov 2023 14:06:50 +0800 Subject: [PATCH 2/2] Update DefaultRestClientFactory.java spotless apply --- .../opensearch/sink/DefaultRestClientFactory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java b/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java index 866b97f..354d618 100644 --- a/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java +++ b/flink-connector-opensearch/src/main/java/org/apache/flink/connector/opensearch/sink/DefaultRestClientFactory.java @@ -88,9 +88,10 @@ protected void configureHttpClientBuilder( try { httpClientBuilder .setSSLContext( - SSLContexts.custom().loadTrustMaterial(new TrustAllStrategy()).build()) - .setSSLHostnameVerifier( - SSLIOSessionStrategy.ALLOW_ALL_HOSTNAME_VERIFIER); + SSLContexts.custom() + .loadTrustMaterial(new TrustAllStrategy()) + .build()) + .setSSLHostnameVerifier(SSLIOSessionStrategy.ALLOW_ALL_HOSTNAME_VERIFIER); } catch (final NoSuchAlgorithmException | KeyStoreException | KeyManagementException ex) {