ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

change to extend

Browse Source
This commit is contained in:
Looly 2021-08-11 21:13:02 +08:00
parent e6b78d943c
commit 9dd7b0a904
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@
* 【poi 】 CsvReader增加readFromStr（pr#1755@Github） * 【poi 】 CsvReader增加readFromStr（pr#1755@Github）
* 【socket 】 SocketUtil增加connection方法 * 【socket 】 SocketUtil增加connection方法
* 【extra 】 JschUtil增加bindPort重载方法（issue#I44UTH@Github） * 【extra 】 JschUtil增加bindPort重载方法（issue#I44UTH@Github）
* 【core 】 DefaultTrustManager改为继承X509ExtendedTrustManager
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 改进NumberChineseFormatter算法，补充完整单元测试，解决零问题 * 【core 】 改进NumberChineseFormatter算法，补充完整单元测试，解决零问题

25
hutool-core/src/main/java/cn/hutool/core/net/DefaultTrustManager.java
View File

@ -1,15 +1,18 @@
package cn.hutool.core.net; package cn.hutool.core.net;
import javax.net.ssl.X509TrustManager; import javax.net.ssl.SSLEngine;
import javax.net.ssl.X509ExtendedTrustManager;
import java.net.Socket;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
/** /**
* 默认信任管理器，默认信任所有客户端和服务端证书 * 默认信任管理器，默认信任所有客户端和服务端证书<br>
* 继承{@link X509ExtendedTrustManager}的原因见：https://blog.csdn.net/ghaohao/article/details/79454913
* *
* @author Looly * @author Looly
* @since 5.5.7 * @since 5.5.7
*/ */
public class DefaultTrustManager implements X509TrustManager { public class DefaultTrustManager extends X509ExtendedTrustManager {
@Override @Override
public X509Certificate[] getAcceptedIssuers() { public X509Certificate[] getAcceptedIssuers() {
@ -23,4 +26,20 @@ public class DefaultTrustManager implements X509TrustManager {
@Override @Override
public void checkServerTrusted(X509Certificate[] chain, String authType) { public void checkServerTrusted(X509Certificate[] chain, String authType) {
} }
@Override
public void checkClientTrusted(X509Certificate[] x509Certificates, String s, Socket socket) {
}
@Override
public void checkServerTrusted(X509Certificate[] x509Certificates, String s, Socket socket) {
}
@Override
public void checkClientTrusted(X509Certificate[] x509Certificates, String s, SSLEngine sslEngine) {
}
@Override
public void checkServerTrusted(X509Certificate[] x509Certificates, String s, SSLEngine sslEngine) {
}
} }

10
hutool-http/src/main/java/cn/hutool/http/ssl/CustomProtocolsSSLFactory.java
View File

@ -12,7 +12,7 @@ import java.security.NoSuchAlgorithmException;
/** /**
* 自定义支持协议类型的SSLSocketFactory * 自定义支持协议类型的SSLSocketFactory
* *
* @author looly * @author looly
*/ */
public class CustomProtocolsSSLFactory extends SSLSocketFactory { public class CustomProtocolsSSLFactory extends SSLSocketFactory {
@ -22,10 +22,10 @@ public class CustomProtocolsSSLFactory extends SSLSocketFactory {
/** /**
* 构造 * 构造
* *
* @param protocols 支持协议列表 * @param protocols 支持协议列表
* @throws KeyManagementException KeyManagementException * @throws KeyManagementException KeyManagementException
* @throws NoSuchAlgorithmException NoSuchAlgorithmException * @throws NoSuchAlgorithmException 无此算法
*/ */
public CustomProtocolsSSLFactory(String... protocols) throws KeyManagementException, NoSuchAlgorithmException { public CustomProtocolsSSLFactory(String... protocols) throws KeyManagementException, NoSuchAlgorithmException {
this.protocols = protocols; this.protocols = protocols;
@ -86,7 +86,7 @@ public class CustomProtocolsSSLFactory extends SSLSocketFactory {
/** /**
* 重置可用策略 * 重置可用策略
* *
* @param socket SSLSocket * @param socket SSLSocket
*/ */
private void resetProtocols(SSLSocket socket) { private void resetProtocols(SSLSocket socket) {
@ -95,4 +95,4 @@ public class CustomProtocolsSSLFactory extends SSLSocketFactory {
} }
} }
} }