Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #18 from jeanblanchard/jenkins26758
[JENKINS-26758] Fix MimeMessageBuilder charset
  • Loading branch information
tfennelly committed Feb 4, 2015
2 parents 7f810ef + 85d729d commit f00df5e
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 3 deletions.
12 changes: 10 additions & 2 deletions src/main/java/jenkins/plugins/mailer/tasks/MimeMessageBuilder.java
Expand Up @@ -29,6 +29,7 @@
import hudson.tasks.Mailer;
import jenkins.model.Jenkins;
import jenkins.model.JenkinsLocationConfiguration;

import org.apache.commons.lang.StringUtils;
import org.jenkinsci.main.modules.instance_identity.InstanceIdentity;

Expand All @@ -39,10 +40,13 @@
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.internet.AddressException;
import javax.mail.internet.HeaderTokenizer;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeUtility;

import java.io.UnsupportedEncodingException;
import java.security.interfaces.RSAPublicKey;
import java.util.Date;
Expand Down Expand Up @@ -161,7 +165,7 @@ public MimeMessage buildMimeMessage() throws MessagingException, UnsupportedEnco

setJenkinsInstanceIdent(msg);

msg.setContent("", mimeType);
msg.setContent("", contentType());
if (StringUtils.isNotBlank(from)) {
msg.setFrom(toNormalizedAddress(from));
}
Expand Down Expand Up @@ -212,12 +216,16 @@ private void addBody(MimeMessage msg) throws MessagingException {
Multipart multipart = new MimeMultipart();
BodyPart bodyPart = new MimeBodyPart();

bodyPart.setContent(body, mimeType);
bodyPart.setContent(body, contentType());
multipart.addBodyPart(bodyPart);
msg.setContent(multipart);
}
}

private String contentType() {
return String.format("%s; charset=%s", mimeType, MimeUtility.quote(charset, HeaderTokenizer.MIME));
}

private void addRecipients(MimeMessage msg) throws UnsupportedEncodingException, MessagingException {
addRecipients(msg, to, Message.RecipientType.TO);
addRecipients(msg, cc, Message.RecipientType.CC);
Expand Down
Expand Up @@ -25,21 +25,24 @@

import hudson.tasks.Mailer;
import jenkins.model.JenkinsLocationConfiguration;

import org.apache.commons.codec.binary.Base64;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Bug;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.mock_javamail.Mailbox;
import org.kohsuke.stapler.framework.io.WriterOutputStream;

import javax.mail.Address;
import javax.mail.Message;
import javax.mail.Transport;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;

import java.io.StringWriter;
import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
Expand Down Expand Up @@ -89,6 +92,43 @@ public void test_construction() throws Exception {
Assert.assertNotNull(publicKey);
}

@Test
@Issue("JENKINS-26758")
public void test_charset_utf8() throws Exception {
MimeMessageBuilder messageBuilder = new MimeMessageBuilder();
messageBuilder.setMimeType("text/html");
messageBuilder.setBody("Synthèse");

MimeMessage message = messageBuilder.buildMimeMessage();
message.saveChanges();

StringWriter sw = new StringWriter();
((MimeMultipart)message.getContent()).getBodyPart(0).writeTo(new WriterOutputStream(sw));
Assert.assertEquals("Content-Type: text/html; charset=UTF-8\n"
+ "Content-Transfer-Encoding: quoted-printable\n\n"
+ "Synth=C3=A8se",
sw.toString().replaceAll("\r\n?", "\n"));
}

@Test
@Issue("JENKINS-26758")
public void test_charset_iso_8859_1() throws Exception {
MimeMessageBuilder messageBuilder = new MimeMessageBuilder();
messageBuilder.setMimeType("text/html");
messageBuilder.setCharset("ISO-8859-1");
messageBuilder.setBody("Synthèse");

MimeMessage message = messageBuilder.buildMimeMessage();
message.saveChanges();

StringWriter sw = new StringWriter();
((MimeMultipart)message.getContent()).getBodyPart(0).writeTo(new WriterOutputStream(sw));
Assert.assertEquals("Content-Type: text/html; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: quoted-printable\n\n"
+ "Synth=E8se",
sw.toString().replaceAll("\r\n?", "\n"));
}

@Test
public void test_send() throws Exception {
MimeMessageBuilder messageBuilder = new MimeMessageBuilder();
Expand Down

0 comments on commit f00df5e

Please sign in to comment.