You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/06/07 02:19:35 UTC
(james-project) branch master updated: JAMES-3742 Avoid altering Mime-Version header
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 93c18b1716 JAMES-3742 Avoid altering Mime-Version header
93c18b1716 is described below
commit 93c18b1716fdb44a15ea4cc6b4002344ed69f741
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Thu Jun 6 17:19:23 2024 +0200
JAMES-3742 Avoid altering Mime-Version header
---
.../java/org/apache/james/server/core/MimeMessageWrapper.java | 7 +++++++
.../org/apache/james/server/core/MimeMessageWrapperTest.java | 9 +++++++++
2 files changed, 16 insertions(+)
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
index 164a5ef850..4743939dfe 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
@@ -57,6 +57,7 @@ import com.google.common.io.CountingInputStream;
* This class is not thread safe.
*/
public class MimeMessageWrapper extends MimeMessage implements Disposable {
+ private static final String MIME_VERSION_HEADER = "MIME-Version";
/**
* System property which tells JAMES if it should copy a message in memory
@@ -523,6 +524,12 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
@Override
public void setHeader(String name, String value) throws MessagingException {
checkModifyHeaders();
+ if (name.equalsIgnoreCase(MIME_VERSION_HEADER)
+ && getHeader(MIME_VERSION_HEADER) != null
+ && value.equals("1.0")
+ && getHeader(MIME_VERSION_HEADER)[0].startsWith("1.0")) {
+ return;
+ }
super.setHeader(name, value);
}
diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
index e671b8ad45..bc96f14fe9 100644
--- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
+++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
@@ -124,6 +124,15 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
mmw.saveChanges();
}
+ @Test
+ void setHeaderShouldNotAlterValidMimeVersionWhenComment() throws Exception {
+ MimeMessageWrapper mw = new MimeMessageWrapper(getMessageFromSources("Subject: foo\r\nMime-Version: 1.0 (Mac OS X Mail 15.0 \\(3693.60.0.1.1\\))\r\rContent-Transfer-Encoding2: plain" + sep + body));
+ mw.setHeader("abc", "def");
+ mw.saveChanges();
+
+ assertThat(mw.getHeader("Mime-Version")[0]).isEqualTo("1.0 (Mac OS X Mail 15.0 \\(3693.60.0.1.1\\))");
+ }
+
@Test
public void testDeferredMessageLoading() throws MessagingException, IOException {
assertThat(mw.getSubject()).isEqualTo("foo");
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org