wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close SMTP connections that failed to open properly

Browse source
This commit is contained in:
Philip Whitehouse 2017-03-02 20:22:53 +00:00
parent 47b86f6146
commit 3670f94424
2 changed files with 89 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
View file

@ -290,7 +290,7 @@ public class SmtpTransport extends Transport {
} }
} }
Map<String,String> extensions = sendHello(localHost); Map<String, String> extensions = sendHello(localHost);
m8bitEncodingAllowed = extensions.containsKey("8BITMIME"); m8bitEncodingAllowed = extensions.containsKey("8BITMIME");
@ -362,7 +362,8 @@ public class SmtpTransport extends Transport {
} else if (authLoginSupported) { } else if (authLoginSupported) {
saslAuthLogin(mUsername, mPassword); saslAuthLogin(mUsername, mPassword);
} else { } else {
throw new MessagingException("Authentication methods SASL PLAIN and LOGIN are unavailable."); throw new MessagingException(
"Authentication methods SASL PLAIN and LOGIN are unavailable.");
} }
break; break;
@ -432,15 +433,22 @@ public class SmtpTransport extends Transport {
break; break;
default: default:
throw new MessagingException("Unhandled authentication method found in the server settings (bug)."); throw new MessagingException(
"Unhandled authentication method found in the server settings (bug).");
} }
} }
} catch (MessagingException e) {
close();
throw e;
} catch (SSLException e) { } catch (SSLException e) {
close();
throw new CertificateValidationException(e.getMessage(), e); throw new CertificateValidationException(e.getMessage(), e);
} catch (GeneralSecurityException gse) { } catch (GeneralSecurityException gse) {
close();
throw new MessagingException( throw new MessagingException(
"Unable to open connection to SMTP server due to security error.", gse); "Unable to open connection to SMTP server due to security error.", gse);
} catch (IOException ioe) { } catch (IOException ioe) {
close();
throw new MessagingException("Unable to open connection to SMTP server.", ioe); throw new MessagingException("Unable to open connection to SMTP server.", ioe);
} }
} }

31
k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java
View file

@ -133,6 +133,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH"); server.output("250 AUTH");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.PLAIN, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.PLAIN, ConnectionSecurity.NONE);
try { try {
@ -172,6 +174,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH PLAIN LOGIN"); server.output("250 AUTH PLAIN LOGIN");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.CRAM_MD5, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.CRAM_MD5, ConnectionSecurity.NONE);
try { try {
@ -181,7 +185,7 @@ public class SmtpTransportTest {
assertEquals("Authentication method CRAM-MD5 is unavailable.", e.getMessage()); assertEquals("Authentication method CRAM-MD5 is unavailable.", e.getMessage());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -214,6 +218,8 @@ public class SmtpTransportTest {
server.expect(""); server.expect("");
server.output("535-5.7.1 Username and Password not accepted. Learn more at"); server.output("535-5.7.1 Username and Password not accepted. Learn more at");
server.output("535 5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68"); server.output("535 5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE);
try { try {
@ -228,7 +234,7 @@ public class SmtpTransportTest {
InOrder inOrder = inOrder(oAuth2TokenProvider); InOrder inOrder = inOrder(oAuth2TokenProvider);
inOrder.verify(oAuth2TokenProvider).getToken(eq(USERNAME), anyInt()); inOrder.verify(oAuth2TokenProvider).getToken(eq(USERNAME), anyInt());
inOrder.verify(oAuth2TokenProvider).invalidateToken(USERNAME); inOrder.verify(oAuth2TokenProvider).invalidateToken(USERNAME);
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -327,6 +333,9 @@ public class SmtpTransportTest {
server.expect(""); server.expect("");
server.output("535-5.7.1 Username and Password not accepted. Learn more at"); server.output("535-5.7.1 Username and Password not accepted. Learn more at");
server.output("535 5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68"); server.output("535 5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE);
try { try {
@ -338,7 +347,7 @@ public class SmtpTransportTest {
e.getMessage()); e.getMessage());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -349,6 +358,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH XOAUTH2"); server.output("250 AUTH XOAUTH2");
server.expect("QUIT");
server.output("221 BYE");
when(oAuth2TokenProvider.getToken(anyString(), anyInt())).thenThrow(new AuthenticationFailedException("Failed to fetch token")); when(oAuth2TokenProvider.getToken(anyString(), anyInt())).thenThrow(new AuthenticationFailedException("Failed to fetch token"));
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE);
@ -359,7 +370,7 @@ public class SmtpTransportTest {
assertEquals("Failed to fetch token", e.getMessage()); assertEquals("Failed to fetch token", e.getMessage());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -371,6 +382,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH PLAIN LOGIN"); server.output("250 AUTH PLAIN LOGIN");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.XOAUTH2, ConnectionSecurity.NONE);
try { try {
@ -380,7 +393,7 @@ public class SmtpTransportTest {
assertEquals("Authentication method XOAUTH2 is unavailable.", e.getMessage()); assertEquals("Authentication method XOAUTH2 is unavailable.", e.getMessage());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -408,6 +421,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH"); server.output("250 AUTH");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.EXTERNAL, ConnectionSecurity.NONE); SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.EXTERNAL, ConnectionSecurity.NONE);
try { try {
@ -417,7 +432,7 @@ public class SmtpTransportTest {
assertEquals(CertificateValidationException.Reason.MissingCapability, e.getReason()); assertEquals(CertificateValidationException.Reason.MissingCapability, e.getReason());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }
@ -449,6 +464,8 @@ public class SmtpTransportTest {
server.expect("EHLO localhost"); server.expect("EHLO localhost");
server.output("250-localhost Hello client.localhost"); server.output("250-localhost Hello client.localhost");
server.output("250 AUTH PLAIN LOGIN"); server.output("250 AUTH PLAIN LOGIN");
server.expect("QUIT");
server.output("221 BYE");
SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.AUTOMATIC, SmtpTransport transport = startServerAndCreateSmtpTransport(server, AuthType.AUTOMATIC,
ConnectionSecurity.NONE); ConnectionSecurity.NONE);
@ -460,7 +477,7 @@ public class SmtpTransportTest {
e.getMessage()); e.getMessage());
} }
server.verifyConnectionStillOpen(); server.verifyConnectionClosed();
server.verifyInteractionCompleted(); server.verifyInteractionCompleted();
} }