From ce9e98886e37ce55daa63f74b690fbd65cfe2dcd Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 12 Dec 2022 18:02:44 +0800 Subject: [PATCH] Update Okhttp ssl config --- app/src/main/java/com/fongmi/android/tv/net/OkHttp.java | 2 +- .../java/com/fongmi/android/tv/net/SSLSocketFactoryCompat.java | 3 +++ drpy/src/main/java/com/hiker/drpy/net/OkHttp.java | 2 +- .../main/java/com/hiker/drpy/net/SSLSocketFactoryCompat.java | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java b/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java index 843bf33b0..598d1b329 100644 --- a/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java +++ b/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java @@ -29,7 +29,7 @@ public class OkHttp { } private OkHttpClient.Builder getBuilder() { - return new OkHttpClient.Builder().callTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); + return new OkHttpClient.Builder().callTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); } private OkHttpClient client() { diff --git a/app/src/main/java/com/fongmi/android/tv/net/SSLSocketFactoryCompat.java b/app/src/main/java/com/fongmi/android/tv/net/SSLSocketFactoryCompat.java index 9d9cb1962..fe561d236 100644 --- a/app/src/main/java/com/fongmi/android/tv/net/SSLSocketFactoryCompat.java +++ b/app/src/main/java/com/fongmi/android/tv/net/SSLSocketFactoryCompat.java @@ -8,6 +8,7 @@ import java.security.cert.X509Certificate; import java.util.LinkedList; import java.util.List; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; @@ -16,6 +17,8 @@ import javax.net.ssl.X509TrustManager; public class SSLSocketFactoryCompat extends SSLSocketFactory { + public static final HostnameVerifier hostnameVerifier = (hostname, session) -> true; + public static final X509TrustManager trustAllCert = new X509TrustManager() { @Override diff --git a/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java b/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java index 86c502d86..2181268ed 100644 --- a/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java +++ b/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java @@ -31,7 +31,7 @@ public class OkHttp { } private OkHttpClient.Builder getBuilder() { - return new OkHttpClient.Builder().sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); + return new OkHttpClient.Builder().hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); } private OkHttpClient client() { diff --git a/drpy/src/main/java/com/hiker/drpy/net/SSLSocketFactoryCompat.java b/drpy/src/main/java/com/hiker/drpy/net/SSLSocketFactoryCompat.java index c74c5a0f5..1945d5226 100644 --- a/drpy/src/main/java/com/hiker/drpy/net/SSLSocketFactoryCompat.java +++ b/drpy/src/main/java/com/hiker/drpy/net/SSLSocketFactoryCompat.java @@ -8,6 +8,7 @@ import java.security.cert.X509Certificate; import java.util.LinkedList; import java.util.List; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; @@ -16,6 +17,8 @@ import javax.net.ssl.X509TrustManager; public class SSLSocketFactoryCompat extends SSLSocketFactory { + public static final HostnameVerifier hostnameVerifier = (hostname, session) -> true; + public static final X509TrustManager trustAllCert = new X509TrustManager() { @Override