UTF-8 support for james-server-core

Author: chibenwa

server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java

@@ -69,7 +69,7 @@ private boolean readNextLine() {
             if (!headerLines.hasMoreElements()) {
                 line += LINE_SEPERATOR;
             }
-            currLine = line.getBytes(StandardCharsets.US_ASCII);
+            currLine = line.getBytes(StandardCharsets.UTF_8);
             return true;
         } else {
             return false;

server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java

@@ -39,8 +39,8 @@
  * </pre>
  */
 public class MailHeaders extends InternetHeaders implements Serializable, Cloneable {
-
     private static final long serialVersionUID = 238748126601L;
+    private static final boolean ALLOWUTF_8 = true;
     private boolean modified = false;
     private long size = -1;
 
@@ -67,7 +67,7 @@ public MailHeaders() {
      */
     public MailHeaders(InputStream in) throws MessagingException {
         super();
-        load(in);
+        load(in, ALLOWUTF_8);
     }
 
     /**

server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java

@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.Properties;
 
@@ -87,6 +88,7 @@ public synchronized void loadMessage() throws MessagingException {
     TestableMimeMessageWrapper mw = null;
     TestableMimeMessageWrapper onlyHeader = null;
     final String content = "Subject: foo\r\nContent-Transfer-Encoding2: plain";
+    final String contentUtf8 = "Subject: fée\r\nContent-Transfer-Encoding2: plain";
     final String sep = "\r\n\r\n";
     final String body = "bar\r\n";
 
@@ -276,6 +278,35 @@ public void testSize() throws MessagingException {
         assertThat(mw.getSize()).isEqualTo(body.length());
     }
 
+    @Test
+    public void testSizeUtf8() throws Exception {
+        TestableMimeMessageWrapper message = getMessageFromSources(contentUtf8 + sep + body);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        message.writeTo(baos);
+
+        assertThat(message.getMessageSize())
+            .isEqualTo(baos.size());
+    }
+
+    @Test
+    public void testWriteToUtf8() throws Exception {
+        TestableMimeMessageWrapper message = getMessageFromSources(contentUtf8 + sep + body);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        message.writeTo(baos);
+
+        assertThat(baos.toString(StandardCharsets.UTF_8)).isEqualTo(contentUtf8 + sep + body);
+    }
+
+    @Test
+    public void testWriteToUtf8AfterHeaderModification() throws Exception {
+        TestableMimeMessageWrapper message = getMessageFromSources(contentUtf8 + sep + body);
+        message.addHeader("Another", "header");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        message.writeTo(baos);
+
+        assertThat(baos.toString(StandardCharsets.UTF_8)).contains("Subject: fée\r\n");
+    }
+
     @Test
     public void getSizeShouldReturnZeroWhenNoHeaderAndAddHeader() throws MessagingException {
         onlyHeader.addHeader("a", "b");