mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 06:01:12 +00:00
Code Issues Releases Wiki Activity

Workaround newline between boundary and headers

Browse source
This commit is contained in:
M66B 2023-07-07 09:28:47 +02:00
parent 7f82f9d4db
commit ef1268f1fa
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/javax/mail/internet/InternetHeaders.java
View file

@ -434,7 +434,33 @@ public class InternetHeaders {
}
prevline = line;
}
first = false;
if (first && android.text.TextUtils.isEmpty(line) && is instanceof ByteArrayInputStream) {
// RFC1341 section 7.2.1
// Note that the encapsulation boundary must occur at the beginning of a line, i.e., following a CRLF,
// and that that initial CRLF is considered to be part of the encapsulation boundary rather than part of the preceding part.
// The boundary must be followed immediately either by another CRLF and the header fields for the next part, or by two CRLFs,
// in which case there are no header fields for the next part (and it is therefore assumed to be of Content-Type text/plain).
// Of course, there are email servers which do not conform to this and insert a newline after the boundary ...
is.mark(0); // ByteArrayInputStream will save position
try {
String l = eu.faircode.email.Helper.readLine(is, java.nio.charset.StandardCharsets.ISO_8859_1);
while (l != null && l.length() > 0) {
if (android.text.TextUtils.isEmpty(l))
break;
if (!l.contains(": ") && !l.startsWith(" ") && !l.startsWith("\t"))
break;
if (l.toLowerCase(Locale.ROOT).startsWith("content-type:")) {
line = l;
break;
}
l = eu.faircode.email.Helper.readLine(is, java.nio.charset.StandardCharsets.ISO_8859_1);
}
first = !android.text.TextUtils.isEmpty(line);
} finally {
is.reset();
}
} else
first = false;
} while (line != null && !isEmpty(line));
} catch (IOException ioex) {
throw new MessagingException("Error in input stream", ioex);