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

Fix SMTP dot stuffing at start of stream

Browse source
This commit is contained in:
cketti 2017-02-21 10:18:13 +01:00
parent 69ba305f2a
commit 238cf80ec9
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail-library/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java
View file

@ -9,7 +9,7 @@ public class SmtpDataStuffing extends FilterOutputStream {
private static final int STATE_CR = 1;
private static final int STATE_CRLF = 2;
private int state = STATE_NORMAL;
private int state = STATE_CRLF;
public SmtpDataStuffing(OutputStream out) {
super(out);

13
k9mail-library/src/test/java/com/fsck/k9/mail/filter/SmtpDataStuffingTest.java
View file

@ -30,11 +30,16 @@ public class SmtpDataStuffingTest {
@Test
public void dotAtStartOfStream() throws IOException {
smtpDataStuffing.write(bytesFor("...Hello .. dots."));
smtpDataStuffing.write(bytesFor(".Hello dots"));
//FIXME: The first line is a line, too. So This should be dot stuffed.
// See https://tools.ietf.org/html/rfc5321#section-4.5.2
assertEquals("...Hello .. dots.", buffer.readUtf8());
assertEquals("..Hello dots", buffer.readUtf8());
}
@Test
public void linesNotStartingWithDot() throws IOException {
smtpDataStuffing.write(bytesFor("Hello\r\nworld\r\n"));
assertEquals("Hello\r\nworld\r\n", buffer.readUtf8());
}
@Test