Skip to content

Bug fix: Attachments with spaces in name are not handled properly #226

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

Merged
merged 1 commit into from
Sep 27, 2019
Merged

Bug fix: Attachments with spaces in name are not handled properly #226

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.simplejavamail.converter.internal.mimemessage;

import javax.mail.internet.ParameterList;
import net.markenwerk.utils.mail.dkim.DkimMessage;
import net.markenwerk.utils.mail.dkim.DkimSigner;
import org.simplejavamail.email.AttachmentResource;
Expand Down Expand Up @@ -260,7 +261,10 @@ private static BodyPart getBodyPartFromDatasource(final AttachmentResource attac
attachmentPart.setDataHandler(new DataHandler(new NamedDataSource(fileName, attachmentResource.getDataSource())));
attachmentPart.setFileName(fileName);
final String contentType = attachmentResource.getDataSource().getContentType();
attachmentPart.setHeader("Content-Type", contentType + "; filename=" + fileName + "; name=" + resourceName);
ParameterList pl = new ParameterList();
pl.set("filename", fileName);
pl.set("name", resourceName);
attachmentPart.setHeader("Content-Type", contentType + pl.toString());
attachmentPart.setHeader("Content-ID", format("<%s>", resourceName));
attachmentPart.setDisposition(dispositionType);
return attachmentPart;
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package org.simplejavamail.converter.internal.mimemessage;

import javax.mail.BodyPart;
import javax.mail.MessagingException;
import javax.mail.internet.ContentType;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import org.assertj.core.api.ThrowableAssert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -131,4 +136,17 @@ public void call() throws Throwable {
})
.hasMessage(MimeMessageParseException.ERROR_SIGNING_DKIM_INVALID_DOMAINKEY);
}

@Test
public void filenameWithSpaceEncoding() throws IOException, MessagingException {
final String fileName = "file name.txt";
final Email email = EmailHelper.createDummyEmailBuilder(true, true, false)
.clearAttachments().withAttachment(fileName, "abc".getBytes(),
"text/plain").buildEmail();
final MimeMessage mimeMessage = EmailConverter.emailToMimeMessage(email);
final BodyPart bodyPart = ((MimeMultipart) mimeMessage.getContent()).getBodyPart(1);
ContentType ct = new ContentType(bodyPart.getHeader("Content-Type")[0]);
assertThat(ct.getParameter("filename")).isEqualTo(fileName);
assertThat(bodyPart.getFileName()).isEqualTo(fileName);
}
}