This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 7d87684af fix issue2651
new 0ee3007de Merge pull request #2681 from jonyangx/issue2651
7d87684af is described below
commit 7d87684af3a58a9d719b4f450734cbc0171f403c
Author: jonyangx <[email protected]>
AuthorDate: Sat Dec 24 09:42:01 2022 +0800
fix issue2651
---
.../client/http/ssl/MyX509TrustManager.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java
index 1a50038ca..af061d422 100644
---
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java
+++
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java
@@ -20,10 +20,14 @@ package org.apache.eventmesh.client.http.ssl;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -33,19 +37,20 @@ import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
public class MyX509TrustManager implements X509TrustManager {
- X509TrustManager myTrustManager;
+ private X509TrustManager myTrustManager;
- public MyX509TrustManager() throws Exception {
+ public MyX509TrustManager() throws KeyStoreException, IOException,
CertificateException, NoSuchAlgorithmException {
KeyStore keyStore = KeyStore.getInstance("JKS");
String fileName = System.getProperty("ssl.client.cer", "");
String pass = System.getProperty("ssl.client.pass", "");
- char[] filePass = null;
- if (StringUtils.isNotBlank(pass)) {
- filePass = pass.toCharArray();
+ char[] filePass = StringUtils.isNotBlank(pass) ? pass.toCharArray() :
new char[0];
+
+ try (InputStream in = Files.newInputStream(
+ Paths.get(System.getProperty("confPath",
System.getenv("confPath"))
+ + File.separator + fileName),
StandardOpenOption.READ)) {
+ keyStore.load(in, filePass);
}
-
keyStore.load(Files.newInputStream(Paths.get(System.getProperty("confPath",
System.getenv("confPath"))
- + File.separator
- + fileName), StandardOpenOption.READ), filePass);
+
TrustManagerFactory trustManagerFactory =
TrustManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(keyStore);
TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
@@ -55,7 +60,8 @@ public class MyX509TrustManager implements X509TrustManager {
return;
}
}
- throw new Exception("Couldn't initialize");
+
+ throw new KeyStoreException("Couldn't initialize");
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
