msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Limit subject header length

Browse Source
pull/199/head
M66B 4 years ago
parent 121b432fd6
commit 704dfe8383
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File

13
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -123,6 +123,7 @@ public class MessageHelper {
static final String HEADER_CORRELATION_ID = "X-Correlation-ID"; static final String HEADER_CORRELATION_ID = "X-Correlation-ID";
static final String FLAG_FORWARDED = "$Forwarded"; static final String FLAG_FORWARDED = "$Forwarded";
private static final int MAX_HEADER_LENGTH = 998;
private static final int MAX_MESSAGE_SIZE = 10 * 1024 * 1024; // bytes private static final int MAX_MESSAGE_SIZE = 10 * 1024 * 1024; // bytes
private static final long ATTACHMENT_PROGRESS_UPDATE = 1500L; // milliseconds private static final long ATTACHMENT_PROGRESS_UPDATE = 1500L; // milliseconds
private static final int MAX_META_EXCERPT = 1024; // characters private static final int MAX_META_EXCERPT = 1024; // characters
@ -203,11 +204,11 @@ public class MessageHelper {
// References // References
if (message.references != null) { if (message.references != null) {
// https://tools.ietf.org/html/rfc5322#section-2.1.1 // https://tools.ietf.org/html/rfc5322#section-2.1.1
// Each line of characters MUST be no more than 998 characters // Each line of characters MUST be no more than 998 characters ... , excluding the CRLF.
String references = message.references; String references = message.references;
int hlen = "References: ".length(); int maxlen = MAX_HEADER_LENGTH - "References: ".length();
int sp = references.indexOf(' '); int sp = references.indexOf(' ');
while (references.length() > 998 - hlen && sp > 0) { while (references.length() > maxlen && sp > 0) {
Log.i("Dropping reference=" + references.substring(0, sp)); Log.i("Dropping reference=" + references.substring(0, sp));
references = references.substring(sp); references = references.substring(sp);
sp = references.indexOf(' '); sp = references.indexOf(' ');
@ -248,8 +249,12 @@ public class MessageHelper {
if (message.bcc != null && message.bcc.length > 0) if (message.bcc != null && message.bcc.length > 0)
imessage.setRecipients(Message.RecipientType.BCC, convertAddress(message.bcc, identity)); imessage.setRecipients(Message.RecipientType.BCC, convertAddress(message.bcc, identity));
if (message.subject != null) if (message.subject != null) {
int maxlen = MAX_HEADER_LENGTH - "Subject: ".length();
if (message.subject.length() > maxlen)
message.subject = message.subject.substring(0, maxlen - 4) + " ...";
imessage.setSubject(message.subject); imessage.setSubject(message.subject);
}
// Send message // Send message
if (identity != null) { if (identity != null) {

Write Preview
Loading…
Cancel
Save