Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaf39635 authored by Danny Baumann's avatar Danny Baumann
Browse files

Don't throw CertificateValidationException for all SSLExceptions. 

An interrupted connection attempt to the server yields an SSLException
as well, like this:

E/k9      ( 6937): Caused by: javax.net.ssl.SSLHandshakeException: Connection closed by peer
E/k9      ( 6937):      at com.android.org.conscrypt.NativeCrypto.SSL_do_handshake(Native Method)
E/k9      ( 6937):      at com.android.org.conscrypt.OpenSSLSocketImpl.startHandshake(OpenSSLSocketImpl.java:302)
E/k9      ( 6937):      at com.android.org.conscrypt.OpenSSLSocketImpl.waitForHandshake(OpenSSLSocketImpl.java:598)
E/k9      ( 6937):      at com.android.org.conscrypt.OpenSSLSocketImpl.getInputStream(OpenSSLSocketImpl.java:560)
E/k9      ( 6937):      at com.fsck.k9.mail.store.ImapStore$ImapConnection.open(ImapStore.java:2459)

We don't want the user to notify of 'certificate problems' in that case.
Fix it by checking whether the SSLException was actually triggered by a
CertificateException.
parent 54d6566f

src/com/fsck/k9/mail/store/ImapStore.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import java.nio.charset.CharsetDecoder; 
import java.nio.charset.CodingErrorAction;

import java.nio.charset.CodingErrorAction;

import java.security.GeneralSecurityException;

import java.security.GeneralSecurityException;

import java.security.Security;

import java.security.Security;

import java.security.cert.CertificateException;

import java.text.SimpleDateFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -2616,7 +2617,11 @@ public class ImapStore extends Store { 
                }

                }





            } catch (SSLException e) {

            } catch (SSLException e) {

                if (e.getCause() instanceof CertificateException) {

                    throw new CertificateValidationException(e.getMessage(), e);

                    throw new CertificateValidationException(e.getMessage(), e);

                } else {

                    throw e;

                }

            } catch (GeneralSecurityException gse) {

            } catch (GeneralSecurityException gse) {

                throw new MessagingException(

                throw new MessagingException(

                    "Unable to open connection to IMAP server due to security error.", gse);

                    "Unable to open connection to IMAP server due to security error.", gse);