Skip to content

fix: try fallback date patterns when mime4j rejects Date header #11224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
syyam wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −1
Open

fix: try fallback date patterns when mime4j rejects Date header #11224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion mail/common/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -46,6 +48,19 @@
* RFC 2045 style headers.
*/
public class MimeMessage extends Message {

// Common non-standard date formats seen in real-world email headers that
// mime4j's DefaultFieldParser rejects. Tried in order; first match wins.
private static final List<String> FALLBACK_DATE_PATTERNS = Arrays.asList(
"EEE, d MMM yyyy HH:mm:ss Z",
"d MMM yyyy HH:mm:ss Z",
"EEE, d MMM yyyy HH:mm Z",
"d MMM yyyy HH:mm Z",
"EEE, d MMM yy HH:mm:ss Z",
"EEE d MMM yyyy HH:mm:ss Z",
"yyyy-MM-dd'T'HH:mm:ssZ"
);

private MimeHeader mHeader = new MimeHeader();
protected Address[] mFrom;
protected Address[] mSender;
Expand Down Expand Up @@ -150,7 +165,11 @@ public Date getSentDate() {
DateTimeField field = (DateTimeField) DefaultFieldParser.parse("Date: " + dateHeaderBody);
mSentDate = field.getDate();
} catch (Exception e) {
Log.d(e, "Couldn't parse Date header field");
Log.d(e, "Couldn't parse Date header field with mime4j, trying fallback patterns");
mSentDate = tryFallbackDateParsing(dateHeaderBody);
if (mSentDate == null) {
Log.w("Could not parse date header using any known pattern: %s", dateHeaderBody);
}
}
}
return mSentDate;
Expand All @@ -164,6 +183,20 @@ public Date getSentDate() {
* @param sentDate
* @throws net.thunderbird.core.common.exception.MessagingException
*/
private Date tryFallbackDateParsing(String dateString) {
String trimmed = dateString.trim();
for (String pattern : FALLBACK_DATE_PATTERNS) {
try {
SimpleDateFormat sdf = new SimpleDateFormat(pattern, Locale.US);
sdf.setLenient(false);
return sdf.parse(trimmed);
} catch (ParseException ignored) {
// try next pattern
}
}
return null;
}

public void addSentDate(Date sentDate, boolean hideTimeZone) {
if (mDateFormat == null) {
mDateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
Expand Down
Loading