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 b562ce50b9 JAMES-4054 Fix remove X-SMIME-Status header in
mailetcontainer.xml
b562ce50b9 is described below
commit b562ce50b93c520f1bd0b418cdb16b426c469fcf
Author: Rene Cordier <[email protected]>
AuthorDate: Tue Aug 20 16:10:03 2024 +0700
JAMES-4054 Fix remove X-SMIME-Status header in mailetcontainer.xml
And add to missing apps
---
server/apps/cassandra-app/sample-configuration/mailetcontainer.xml | 6 +++++-
.../apps/distributed-app/sample-configuration/mailetcontainer.xml | 6 +++++-
.../distributed-pop3-app/sample-configuration/mailetcontainer.xml | 4 ++++
server/apps/jpa-app/sample-configuration/mailetcontainer.xml | 4 ++++
server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml | 4 ++++
server/apps/memory-app/sample-configuration/mailetcontainer.xml | 6 +++++-
6 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
index b883132627..0cb3fd52c9 100644
--- a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
@@ -70,7 +70,11 @@
</matcher>
<mailet match="All" class="RemoveMimeHeader">
- <name>bcc,X-SMIME-Status</name>
+ <name>bcc</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
<onMailetException>ignore</onMailetException>
</mailet>
<mailet match="All" class="RecipientRewriteTable">
diff --git
a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
index b883132627..0cb3fd52c9 100644
--- a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
@@ -70,7 +70,11 @@
</matcher>
<mailet match="All" class="RemoveMimeHeader">
- <name>bcc,X-SMIME-Status</name>
+ <name>bcc</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
<onMailetException>ignore</onMailetException>
</mailet>
<mailet match="All" class="RecipientRewriteTable">
diff --git
a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
index 19a839cdc1..ee0448eaf8 100644
--- a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
@@ -72,6 +72,10 @@
<name>bcc</name>
<onMailetException>ignore</onMailetException>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>rrt-error</errorProcessor>
</mailet>
diff --git a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
index 55e84ba625..5be2bf0976 100644
--- a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
@@ -72,6 +72,10 @@
<name>bcc</name>
<onMailetException>ignore</onMailetException>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>rrt-error</errorProcessor>
</mailet>
diff --git a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
index 0fa87f2c4a..dab98ab375 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
@@ -70,6 +70,10 @@
<name>bcc</name>
<onMailetException>ignore</onMailetException>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable" />
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
diff --git a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
index 4d4ca92d15..8166c3b05a 100644
--- a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
@@ -70,7 +70,11 @@
</matcher>
<mailet match="All" class="RemoveMimeHeader">
- <name>bcc,X-SMIME-Status</name>
+ <name>bcc</name>
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>X-SMIME-Status</name>
<onMailetException>ignore</onMailetException>
</mailet>
<mailet match="All" class="RecipientRewriteTable">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
