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

Fix encrypted, attached inner message/rfc822

Browse source
This commit is contained in:
Vincent Breitmoser 2018-01-09 03:26:30 +01:00
parent d0c8cc3b57
commit 0e75978d6e
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
k9mail/src/main/java/com/fsck/k9/mailstore/MimePartStreamParser.java
View file

@ -16,6 +16,7 @@ import com.fsck.k9.mail.Part;
import com.fsck.k9.mail.internet.MimeBodyPart; import com.fsck.k9.mail.internet.MimeBodyPart;
import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.internet.MimeMessage;
import com.fsck.k9.mail.internet.MimeMultipart; import com.fsck.k9.mail.internet.MimeMultipart;
import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mailstore.util.FileFactory; import com.fsck.k9.mailstore.util.FileFactory;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.MimeException;
@ -39,7 +40,7 @@ public class MimePartStreamParser {
.build(); .build();
MimeStreamParser parser = new MimeStreamParser(parserConfig); MimeStreamParser parser = new MimeStreamParser(parserConfig);
parser.setContentHandler(new PartBuilder(fileFactory, parsedRootPart)); parser.setContentHandler(new PartBuilder(parser, fileFactory, parsedRootPart));
parser.setRecurse(); parser.setRecurse();
try { try {
@ -66,11 +67,17 @@ public class MimePartStreamParser {
private static class PartBuilder implements ContentHandler { private static class PartBuilder implements ContentHandler {
private MimeStreamParser parser;
private final FileFactory fileFactory; private final FileFactory fileFactory;
private final MimeBodyPart decryptedRootPart; private final MimeBodyPart decryptedRootPart;
private final Stack<Object> stack = new Stack<>(); private final Stack<Object> stack = new Stack<>();
public PartBuilder(FileFactory fileFactory, MimeBodyPart decryptedRootPart) { private boolean isMessagePart;
private boolean isContentDispositionAttachment;
PartBuilder(MimeStreamParser parser, FileFactory fileFactory,
MimeBodyPart decryptedRootPart) {
this.parser = parser;
this.fileFactory = fileFactory; this.fileFactory = fileFactory;
this.decryptedRootPart = decryptedRootPart; this.decryptedRootPart = decryptedRootPart;
} }
@ -111,11 +118,13 @@ public class MimePartStreamParser {
@Override @Override
public void endBodyPart() throws MimeException { public void endBodyPart() throws MimeException {
stack.pop(); stack.pop();
parser.setRecurse();
} }
@Override @Override
public void startHeader() throws MimeException { public void startHeader() throws MimeException {
// Do nothing isMessagePart = false;
isContentDispositionAttachment = false;
} }
@Override @Override
@ -125,11 +134,22 @@ public class MimePartStreamParser {
Part part = (Part) stack.peek(); Part part = (Part) stack.peek();
part.addRawHeader(name, raw); part.addRawHeader(name, raw);
String fieldImmediateValue = MimeUtility.getHeaderParameter(parsedField.getBody(), null);
if ("Content-Type".equalsIgnoreCase(name) && MimeUtility.isMessage(fieldImmediateValue)) {
isMessagePart = true;
}
if ("Content-Disposition".equalsIgnoreCase(name) && "attachment".equalsIgnoreCase(fieldImmediateValue)) {
isContentDispositionAttachment = true;
}
} }
@Override @Override
public void endHeader() throws MimeException { public void endHeader() throws MimeException {
// Do nothing if (isMessagePart && isContentDispositionAttachment) {
parser.setFlat();
}
} }
@Override @Override