Skip to content

EMAIL-204: Disable eager attachment loading on MimeMessageParser #135

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
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

EMAIL-204: Disable eager attachment loading on MimeMessageParser #135

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
49503b9
EMAIL-204: Disable eager loading while parsing email attachement
HiuKwok Feb 6, 2023
4a34933
EMAIL-204: Remove unused methods
HiuKwok Feb 6, 2023
ae324f9
EMAIL-204: Update dep
HiuKwok Feb 8, 2023
e48d8c8
EMAIL-204: Wrapper class for data src
HiuKwok Feb 8, 2023
a976fff
EMAIL-204: Update count
HiuKwok Feb 8, 2023
8712ae0
EMAIL-204: Update test-cases
HiuKwok Feb 27, 2023
395ca7a
EMAIL-204: Update testcases
HiuKwok Feb 27, 2023
44c8ae5
EMAIL-204: Java doc
HiuKwok Mar 2, 2023
e5e3b06
EMAIL-204: Update testcase
HiuKwok Mar 2, 2023
eb2673f
EMAIL-204: Remove unused class
HiuKwok Mar 2, 2023
0af6160
EMAIL-204: Update import
HiuKwok Mar 2, 2023
6bb26b6
EMAIL-204: Update code style
HiuKwok Mar 2, 2023
286bd35
EMAIL-204: Update import
HiuKwok Mar 2, 2023
23ba449
EMAIL-204: Typo
HiuKwok Mar 2, 2023
5dbcc5f
EMAIL-204: Code style fix
HiuKwok Mar 4, 2023
1685f07
EMAIL-204: Update testcase
HiuKwok Mar 4, 2023
c101e96
EMAIL-204: Update java doc
HiuKwok Mar 4, 2023
e5164d8
EMAIL-204: Update test import
HiuKwok Mar 4, 2023
094a2b3
EMAIL-204: Update test-case
HiuKwok Mar 4, 2023
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
54 changes: 5 additions & 49 deletions src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,17 @@
*/
package org.apache.commons.mail.util;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.internet.ContentType;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimePart;
import javax.mail.internet.MimeUtility;
import javax.mail.internet.ParseException;
import javax.mail.internet.*;
import javax.mail.util.ByteArrayDataSource;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.*;

/**
* Parses a MimeMessage and stores the individual parts such a plain text,
Expand Down Expand Up @@ -270,12 +253,7 @@ protected DataSource createDataSource(final Multipart parent, final MimePart par
final DataHandler dataHandler = part.getDataHandler();
final DataSource dataSource = dataHandler.getDataSource();
final String contentType = getBaseMimeType(dataSource.getContentType());
byte[] content;
try (InputStream inputStream = dataSource.getInputStream())
{
content = this.getContent(inputStream);
}
final ByteArrayDataSource result = new ByteArrayDataSource(content, contentType);
final ByteArrayDataSource result = new ByteArrayDataSource(dataSource.getInputStream(), contentType);
final String dataSourceName = getDataSourceName(part, dataSource);
result.setName(dataSourceName);
return result;
Expand Down Expand Up @@ -411,28 +389,6 @@ protected String getDataSourceName(final Part part, final DataSource dataSource)
return result;
}

/**
* Read the content of the input stream.
*
* @param is the input stream to process
* @return the content of the input stream
* @throws IOException reading the input stream failed
*/
private byte[] getContent(final InputStream is)
throws IOException
{
final ByteArrayOutputStream os = new ByteArrayOutputStream();
final BufferedInputStream isReader = new BufferedInputStream(is);
try (BufferedOutputStream osWriter = new BufferedOutputStream(os)) {
int ch;
while ((ch = isReader.read()) != -1)
{
osWriter.write(ch);
}
osWriter.flush();
return os.toByteArray();
}
}

/**
* Parses the mimeType.
Expand Down