From b206e9d9ce63012e0e5c5b6ba23aadeb200ea25c Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 11 Dec 2020 08:32:11 +0100 Subject: [PATCH] Disable host name verification for favicons --- .../main/java/eu/faircode/email/ContactInfo.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java index 408f5becc8..48cf1a298e 100644 --- a/app/src/main/java/eu/faircode/email/ContactInfo.java +++ b/app/src/main/java/eu/faircode/email/ContactInfo.java @@ -71,11 +71,13 @@ import java.util.concurrent.Future; import javax.mail.Address; import javax.mail.internet.InternetAddress; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLException; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLProtocolException; +import javax.net.ssl.SSLSession; public class ContactInfo { private String email; @@ -462,6 +464,12 @@ public class ContactInfo { connection.setReadTimeout(FAVICON_READ_TIMEOUT); connection.setConnectTimeout(FAVICON_CONNECT_TIMEOUT); connection.setInstanceFollowRedirects(true); + connection.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + return true; + } + }); connection.connect(); String response; @@ -537,6 +545,12 @@ public class ContactInfo { connection.setReadTimeout(FAVICON_READ_TIMEOUT); connection.setConnectTimeout(FAVICON_CONNECT_TIMEOUT); connection.setInstanceFollowRedirects(true); + connection.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + return true; + } + }); connection.connect(); try {