ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DO NOT MERGE. Handle STARTTLS when last line in EHLO response. 

When receiving the EHLO response from the SMTP server, the multiline
answer has "-" prefix in all lines except the last line, where the
prefix is a blank. This is according to RFC 2821 section 4.2.1. This has
also been reported as issue 2309 at code.google.com.

Bug: 1744768

Change-Id: I3feccabed30767d2fa5b06352cd7d1c803e8d59c
This commit is contained in:
Andrew Stadler 2010-04-06 10:50:11 -07:00
parent 624af658ff
commit dc0753373e
3 changed files with 91 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/mail/transport/SmtpSender.java
View File

@ -140,7 +140,7 @@ public class SmtpSender extends Sender {
* if not.
*/
if (mTransport.canTryTlsSecurity()) {
if (result.contains("-STARTTLS")) {
if (result.contains("-STARTTLS") || result.contains(" STARTTLS")) {
executeSimpleCommand("STARTTLS");
mTransport.reopenTls();
/*

28
tests/src/com/android/email/mail/transport/MockTransport.java
View File

@ -40,6 +40,8 @@ public class MockTransport implements Transport {
private boolean mSslAllowed = false;
private boolean mTlsAllowed = false;
private boolean mTlsReopened = false;
private boolean mOpen;
private boolean mInputOpen;
@ -248,10 +250,30 @@ public class MockTransport implements Transport {
return line;
}
public void reopenTls() /* throws MessagingException */ {
public void setTlsAllowed(boolean tlsAllowed) {
mTlsAllowed = tlsAllowed;
}
public boolean getTlsAllowed() {
return mTlsAllowed;
}
public void setSslAllowed(boolean sslAllowed) {
mSslAllowed = sslAllowed;
}
public boolean getSslAllowed() {
return mSslAllowed;
}
public void reopenTls() {
SmtpSenderUnitTests.assertTrue(mOpen);
SmtpSenderUnitTests.assertTrue(mTlsAllowed);
SmtpSenderUnitTests.fail("reopenTls() not implemented");
mTlsReopened = true;
}
public boolean getTlsReopened() {
return mTlsReopened;
}
public void setSecurity(int connectionSecurity, boolean trustAllCertificates) {
@ -347,4 +369,4 @@ public class MockTransport implements Transport {
}
}
}
}
}

68
tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
View File

@ -91,12 +91,74 @@ public class SmtpSenderUnitTests extends ProviderTestCase2<EmailProvider> {
/**
* TODO: Test with SSL negotiation (faked)
* TODO: Test with SSL required but not supported
* TODO: Test with TLS negotiation (faked)
* TODO: Test with TLS required but not supported
* TODO: Test other capabilities.
* TODO: Test AUTH LOGIN
*/
/**
* Confirms TLS login
*/
public void testTlsLogin() throws MessagingException {
// test with "250-STARTTLS"
MockTransport mockDash = new MockTransport();
mockDash.setSecurity(Transport.CONNECTION_SECURITY_TLS, false);
mockDash.setTlsAllowed(true);
mSender.setTransport(mockDash);
// try to open it
mockDash.expect(null, "220 MockTransport 2000 Ready To Assist You Peewee");
mockDash.expect("EHLO .*", "250-10.20.30.40 hello");
mockDash.expect(null, "250-STARTTLS");
mockDash.expect(null, "250 AUTH LOGIN PLAIN CRAM-MD5");
mockDash.expect("STARTTLS", "220 Ready to start TLS");
mockDash.expect("EHLO .*", "250-10.20.30.40 hello");
mockDash.expect(null, "250-STARTTLS");
mockDash.expect(null, "250 AUTH LOGIN PLAIN CRAM-MD5");
mockDash.expect("AUTH PLAIN .*", "235 2.7.0 ... authentication succeeded");
mSender.open();
assertTrue("dash", mockDash.getTlsReopened());
// test with "250 STARTTLS"
MockTransport mockSpace = new MockTransport();
mockSpace.setSecurity(Transport.CONNECTION_SECURITY_TLS, false);
mockSpace.setTlsAllowed(true);
mSender.setTransport(mockSpace);
// try to open it
mockSpace.expect(null, "220 MockTransport 2000 Ready To Assist You Peewee");
mockSpace.expect("EHLO .*", "250-10.20.30.40 hello");
mockSpace.expect(null, "250-AUTH LOGIN PLAIN CRAM-MD5");
mockSpace.expect(null, "250 STARTTLS");
mockSpace.expect("STARTTLS", "220 Ready to start TLS");
mockSpace.expect("EHLO .*", "250-10.20.30.40 hello");
mockSpace.expect(null, "250-AUTH LOGIN PLAIN CRAM-MD5");
mockSpace.expect(null, "250 STARTTLS");
mockSpace.expect("AUTH PLAIN .*", "235 2.7.0 ... authentication succeeded");
mSender.open();
assertTrue("space", mockSpace.getTlsReopened());
}
/**
* Confirms TLS required but not supported
*/
public void testTlsRequiredNotSupported() throws MessagingException {
MockTransport mockTransport = new MockTransport();
mockTransport.setSecurity(Transport.CONNECTION_SECURITY_TLS, false);
mSender.setTransport(mockTransport);
// try to open it
mockTransport.expect(null, "220 MockTransport 2000 Ready To Assist You Peewee");
mockTransport.expect("EHLO .*", "");
setupOpen(mockTransport, "");
try {
mSender.open();
fail("Should not be able to open() without TLS.");
} catch (MessagingException me) {
// good - expected
}
}
/**
* Test: Open and send a single message (sunny day)
*/