zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Susimail: Fix forwarding email with attachments lacking specified encoding

Browse Source 
MailPart.encoding is now always non-null.
This commit is contained in:
zzz
2024-04-04 14:48:08 -04:00
parent 3a18721c52
commit d9c67ecc2e
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/susimail/src/src/i2p/susi/webmail/MailPart.java
View File

@@ -56,6 +56,7 @@ class MailPart {
private static final OutputStream DUMMY_OUTPUT = new DummyOutputStream(); private static final OutputStream DUMMY_OUTPUT = new DummyOutputStream();
public final String[] headerLines; public final String[] headerLines;
/** encoding non-null */
public final String type, encoding, name, public final String type, encoding, name,
description, disposition, charset, version, multipart_type, cid; description, disposition, charset, version, multipart_type, cid;
/** begin, end, and beginBody are relative to readBuffer.getOffset(). /** begin, end, and beginBody are relative to readBuffer.getOffset().
@@ -191,6 +192,9 @@ class MailPart {
} }
} }
// RFC 2045 Sec. 6.1: 7bit is the default
if (x_encoding == null)
x_encoding = "7bit";
encoding = x_encoding; encoding = x_encoding;
disposition = x_disposition; disposition = x_disposition;
type = x_type; type = x_type;
@@ -265,7 +269,7 @@ class MailPart {
tmpEnd = (int) counter.getRead(); tmpEnd = (int) counter.getRead();
} }
end = tmpEnd; end = tmpEnd;
if (encoding == null || encoding.equals("7bit") || encoding.equals("8bit") || encoding.equals("binary")) { if (encoding.equals("7bit") || encoding.equals("8bit") || encoding.equals("binary")) {
decodedLength = end - beginBody; decodedLength = end - beginBody;
} }
//if (Debug.getLevel() >= Debug.DEBUG) //if (Debug.getLevel() >= Debug.DEBUG)
@@ -325,15 +329,9 @@ class MailPart {
* @since 0.9.13 * @since 0.9.13
*/ */
public synchronized void decode(int offset, Buffer out) throws IOException { public synchronized void decode(int offset, Buffer out) throws IOException {
String encg = encoding; Encoding enc = EncodingFactory.getEncoding(encoding);
if (encg == null) {
//throw new DecodingException("No encoding specified");
if (_log.shouldDebug()) _log.debug("Warning: no transfer encoding found, fallback to 7bit.");
encg = "7bit";
}
Encoding enc = EncodingFactory.getEncoding(encg);
if(enc == null) if(enc == null)
throw new DecodingException(_t("No encoder found for encoding \\''{0}\\''.", WebMail.quoteHTML(encg))); throw new DecodingException(_t("No encoder found for encoding \\''{0}\\''.", WebMail.quoteHTML(encoding)));
InputStream in = null; InputStream in = null;
LimitInputStream lin = null; LimitInputStream lin = null;
CountingOutputStream cos = null; CountingOutputStream cos = null;

2
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -1314,7 +1314,7 @@ public class WebMail extends HttpServlet
attachments = new ArrayList<Attachment>(parts.size()); attachments = new ArrayList<Attachment>(parts.size());
MailCache drafts = sessionObject.caches.get(DIR_DRAFTS); MailCache drafts = sessionObject.caches.get(DIR_DRAFTS);
for (MailPart mp : parts) { for (MailPart mp : parts) {
if (mp.name == null || mp.type == null || mp.encoding == null) { if (mp.name == null || mp.type == null) {
if (log.shouldDebug()) if (log.shouldDebug())
log.debug("skipping fwd att: " + mp); log.debug("skipping fwd att: " + mp);
continue; continue;