lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix trust bug

Browse Source
This commit is contained in:
Looly 2021-01-07 22:47:42 +08:00
parent 64555cdc87
commit 7fd389c0b3
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@
* 【core 】 修复CsvReader读取双引号未转义问题（issue#I2BMP1@Gitee）
* 【json 】 JSONUtil.parse修复config无效问题（issue#1363@Github）
* 【http 】 修复SimpleServer返回响应内容Content-Length不正确的问题（issue#1358@Github）
* 【http 】 修复Https请求部分环境下报证书验证异常问题（issue#I2C1BZ@Github）
-------------------------------------------------------------------------------------------------------------

5
hutool-http/src/main/java/cn/hutool/http/ssl/DefaultTrustManager.java → hutool-core/src/main/java/cn/hutool/core/net/DefaultTrustManager.java
View File

@ -1,12 +1,13 @@
package cn.hutool.http.ssl;
package cn.hutool.core.net;
import javax.net.ssl.X509TrustManager;
import java.security.cert.X509Certificate;
/**
* 证书管理
* 默认信任管理器，默认信任所有客户端和服务端证书
*
* @author Looly
* @since 5.5.7
*/
public class DefaultTrustManager implements X509TrustManager {

2
hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java
View File

@ -52,7 +52,7 @@ public class SSLContextBuilder {
private String protocol = TLS;
private KeyManager[] keyManagers;
private TrustManager[] trustManagers;
private TrustManager[] trustManagers = {new DefaultTrustManager()};
private SecureRandom secureRandom = new SecureRandom();

3
hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
View File

@ -4,9 +4,6 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

2
hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
View File

@ -253,7 +253,7 @@ final class InternalJSONUtil {
//默认使用时间戳
long timeMillis;
if (dateObj instanceof TemporalAccessor) {
timeMillis = DateUtil.toInstant((TemporalAccessor) dateObj).toEpochMilli();
timeMillis = TemporalAccessorUtil.toEpochMilli((TemporalAccessor) dateObj);
} else if (dateObj instanceof Date) {
timeMillis = ((Date) dateObj).getTime();
} else if (dateObj instanceof Calendar) {