This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch rfc-6532
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 50ef109279d3e1f85b74af949a1eb344e5c6cb30
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Fri May 16 14:07:26 2025 +0200
POC RFC-6532 Support for i8n emails
---
.../src/test/resources/eml/cve-2024-23184.eml | 45 ++++++++++++++++++++++
.../james/mailets/AddDeliveredToHeaderTest.java | 25 ++++++++++++
2 files changed, 70 insertions(+)
diff --git a/mailbox/opensearch/src/test/resources/eml/cve-2024-23184.eml
b/mailbox/opensearch/src/test/resources/eml/cve-2024-23184.eml
new file mode 100644
index 0000000000..30b57dd743
--- /dev/null
+++ b/mailbox/opensearch/src/test/resources/eml/cve-2024-23184.eml
@@ -0,0 +1,45 @@
+MIME-Version: 1.0
+Subject: Test
+From: Benoit TELLIER <btell...@linagora.com>
+To: Benoit TELLIER <btell...@linagora.com>
+Date: Tue, 13 Feb 2024 23:01:18 +0000
+Message-ID: <mime4j.17d.c7b7d059b303c215.18da4b40...@linagora.com>
+Content-Type: multipart/mixed;
+ boundary="-=Part.17f.732e3d28e1c76db4.18da4b40791.62ef5e3fa995057d=-"
+
+---=Part.17f.732e3d28e1c76db4.18da4b40791.62ef5e3fa995057d=-
+Content-Type: multipart/alternative;
+ boundary="-=Part.17e.48ac92d73c356567.18da4b40791.360a293e2f389efe=-"
+
+---=Part.17e.48ac92d73c356567.18da4b40791.360a293e2f389efe=-
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Test
+
+---=Part.17e.48ac92d73c356567.18da4b40791.360a293e2f389efe=-
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div>Test<br><br></div>
+
+---=Part.17e.48ac92d73c356567.18da4b40791.360a293e2f389efe=---
+
+---=Part.17f.732e3d28e1c76db4.18da4b40791.62ef5e3fa995057d=-
+Content-Type: application/json; name="=?US-ASCII?Q?id=5Frsa.txt?="
+Content-Disposition: attachment
+Content-Transfer-Encoding: base64
+
+c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFDQVFDa0dXMkp5c2lKR2hQZXdBOXRr
+bVFFQm5EVjRaQ0llLy92ZFoyV0RybnZiNlZLQzdpWldjODFpU1ZkTFcxUkRBTll4c3ExN0dQanpV
+OFlWdk9sRkFJSk1WTm9ESWhuQWtYOU9VUUJpd1hpOHlHZ3FLNGR0RmIxczJBRzNrQmxNUFFJOE5K
+MkpLT2Z5MW51VnJubEtoVDlCVnpYMm5iSjNOak9PZlkxQlJEaDZZcVl1a2RuejBUT2k1Rkp1YUJT
+NDZQemx3eWdIa0dzeXBLVHM2Y2FUNjBRdjl3eWFadm4yenN1RmNML3o2Mmd3aGZyZGFsakF1UGRX
+cERlNG1IRVFmMXA2SXNRMDdPb0lwTmRHQ0tLZHRZQlVTcktzTXRpMllLUGZpSzB2WGU1L3owRWJE
+VlRja1BrY3NwQ2cwYVZuZTB2eFVsRGt2U2pwV2tiQkZ0YTk5ekJjOVlJL0ROK28vRmtONlFTdXV5
+U29tNDZkamZpUjdqSzNMRmJKUkhaem9BblNvaTZvRlR0MW1LWjNzam44bnZWUG1PV3pJWHY0Tm1O
+R1ExZHFrV1hXcUtyQjlIZUZiQnRPWVAzaEkxQ0kvaVhNbVR1SkdvcHVTUmlTNW1QZXlSQWV6VGtk
+UG8vZ2NSVWNzbklhVW1EallUWHBFNzU3Yk5LWVNHbFJsS3FrbEhKc2JveEdTK0NaVzBJS2dZeTdG
+cmZRZ1FGMTdvaUpWM1JJQ1VHcU9rM1I2VnZOYlhlL2VmZS9IT24xd0lZUS9qVGRzY0hCamRIM2FF
+MmY4Y3dVS1IzNUtWNlJ1SE4vYVpiekxiVkJxUEMvUTcwd3NMQlloV29Da1dRMElUUmxGV2N3bnN3
+VTE5NnlGWkVHSmthOUNEaHZQdUVBV0NLWnFRT3gyMnRoYWVSQlE9PSBiZW53YUBob3Jpem9uCg==
\ No newline at end of file
diff --git
a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index d5bb6c788a..81b1982fce 100644
---
a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++
b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -43,6 +43,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
class AddDeliveredToHeaderTest {
+ public static final String RECIPIENT2 = "rené@" + DEFAULT_DOMAIN;
@RegisterExtension
public TestIMAPClient testIMAPClient = new TestIMAPClient();
@RegisterExtension
@@ -58,6 +59,7 @@ class AddDeliveredToHeaderTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
+ dataProbe.addUser(RECIPIENT2, PASSWORD);
dataProbe.addUser(FROM, PASSWORD);
}
@@ -79,4 +81,27 @@ class AddDeliveredToHeaderTest {
assertThat(testIMAPClient.readFirstMessageHeaders())
.contains(AddDeliveredToHeader.DELIVERED_TO + ": " + RECIPIENT);
}
+
+ @Test
+ void receivedMessagesShouldContainDeliveredToHeadersI8N() throws Exception
{
+ String message = "FROM: " + RECIPIENT2 + "\r\n" +
+ "subject: testé\r\n" +
+ "Content-Type: text/plain; charset=UTF-8\r\n" +
+ "Content-Encoding: 8bit\r\n" +
+ "\r\n" +
+ "contenté\r\n" +
+ ".\r\n";
+ messageSender.connect(LOCALHOST_IP,
jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
+ .authenticate(FROM, PASSWORD)
+ .sendMessageWithHeaders(FROM, RECIPIENT2, message);
+
+ testIMAPClient.connect(LOCALHOST_IP,
jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
+ .login(RECIPIENT2, PASSWORD)
+ .select(TestIMAPClient.INBOX)
+ .awaitMessage(awaitAtMostOneMinute);
+ assertThat(testIMAPClient.readFirstMessageHeaders())
+ .contains("René")
+ .contains("testé")
+ .contains("contenté");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
