This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b2e25abdd7 [INLONG-9762][SDK] DataProxy SDK support configure tls
version (#9765)
b2e25abdd7 is described below
commit b2e25abdd75db42aadae396cc973a8b2b4b7af87
Author: castor <[email protected]>
AuthorDate: Mon Mar 4 18:51:47 2024 +0800
[INLONG-9762][SDK] DataProxy SDK support configure tls version (#9765)
Co-authored-by: castorqin <[email protected]>
---
.../java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java | 9 +++++++++
.../apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
index 9168c3a1f7..05b439d7f1 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
@@ -48,6 +48,7 @@ public class ProxyClientConfig {
private String confStoreBasePath = System.getProperty("user.dir") +
"/.inlong/";
private String tlsServerCertFilePathAndName;
private String tlsServerKey;
+ private String tlsVersion = "TLSv1.2";
private int maxTimeoutCnt = ConfigConstants.MAX_TIMEOUT_CNT;
private String authSecretId;
private String authSecretKey;
@@ -372,6 +373,14 @@ public class ProxyClientConfig {
this.tlsServerCertFilePathAndName = tlsServerCertFilePathAndName;
}
+ public String getTlsVersion() {
+ return tlsVersion;
+ }
+
+ public void setTlsVersion(String tlsVersion) {
+ this.tlsVersion = tlsVersion;
+ }
+
public String getUserName() {
return userName;
}
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
index cca02b0381..25c93d6a60 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
@@ -797,7 +797,7 @@ public class ProxyConfigManager extends Thread {
.setSocketTimeout(clientConfig.getManagerSocketTimeout()).build();
SSLContext sslContext = SSLContexts.custom().build();
SSLConnectionSocketFactory sslsf = new
SSLConnectionSocketFactory(sslContext,
- new String[]{"TLSv1"}, null,
+ new String[]{clientConfig.getTlsVersion()}, null,
SSLConnectionSocketFactory.getDefaultHostnameVerifier());
httpClient =
HttpClients.custom().setDefaultHeaders(headers).setDefaultRequestConfig(requestConfig)
.setSSLSocketFactory(sslsf).build();