JAMES-2469 Remove custom header setting from configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f46313de Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f46313de Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f46313de Branch: refs/heads/master Commit: f46313dee5e7a3eea2aca2a419aaaedb9f323942 Parents: faf21d9 Author: benwa <[email protected]> Authored: Tue Jul 17 10:43:19 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:49 2018 +0700 ---------------------------------------------------------------------- .../destination/conf/mailetcontainer.xml | 10 ---------- .../destination/conf/mailetcontainer.xml | 11 +---------- .../jpa/destination/conf/mailetcontainer.xml | 10 ---------- .../spring/destination/conf/mailetcontainer.xml | 10 ---------- .../src/test/resources/mailetcontainer.xml | 5 ----- .../src/test/resources/mailetcontainer.xml | 4 ---- .../src/test/resources/mailetcontainer.xml | 5 +---- .../src/test/resources/mailetcontainer.xml | 4 ---- .../sample-configuration/mailetcontainer.xml | 8 -------- .../src/test/resources/mailetcontainer.xml | 18 ------------------ .../sample-configuration/mailetcontainer.xml | 8 -------- .../src/test/resources/mailetcontainer.xml | 18 ------------------ .../sample-configuration/mailetcontainer.xml | 8 -------- .../src/test/resources/mailetcontainer.xml | 4 ---- .../src/test/resources/mailetcontainer.xml | 4 ---- .../src/test/resources/mailetcontainer.xml | 4 ---- 16 files changed, 2 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml index d00a4a5..3839b39 100644 --- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml @@ -56,16 +56,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> <onMailetException>ignore</onMailetException> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml index 8a154e9..3839b39 100644 --- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml @@ -55,16 +55,7 @@ <matcher match="SentByMailet"/> <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> + <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> <onMailetException>ignore</onMailetException> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml index e7df363..642bea4 100644 --- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml @@ -55,16 +55,6 @@ <matcher match="SentByMailet"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> <onMailetException>ignore</onMailetException> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/spring/destination/conf/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml index d1f51c1..3209409 100644 --- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml @@ -55,16 +55,6 @@ <matcher match="SentByMailet"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - <onMailetException>ignore</onMailetException> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> <onMailetException>ignore</onMailetException> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml index 1a86820..d854443 100644 --- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml +++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml @@ -47,12 +47,7 @@ </mailet> </processor> - <processor state="transport" enableJmx="true"> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/cli-integration/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml index 417b9e4..f14a335 100644 --- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml +++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml @@ -53,10 +53,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml index 298fd52..4a7d1e8 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml @@ -53,10 +53,7 @@ <matcher match="SentByMailet"/> <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> + <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml index f68b1a2..4204c18 100644 --- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml @@ -52,10 +52,6 @@ <matcher match="SentByMailet"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml index d3a81be..de035fb 100644 --- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml @@ -53,14 +53,6 @@ <matcher match="SentByMailet"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> <mailet match="All" class="RecipientRewriteTable" /> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml index d0cfea7..dedb391 100644 --- a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml @@ -53,27 +53,12 @@ <processor state="transport" enableJmx="true"> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> - <mailet match="All" class="RemoveMimeHeader"> - <name>bcc</name> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <!-- <mailet match="HostIsLocal" class="ToProcessor"> - <processor>local-address-error</processor> - <notice>550 - Requested action not taken: no such user here</notice> - </mailet> --> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> <delayTime>5 minutes</delayTime> @@ -88,9 +73,6 @@ <sendpartial>false</sendpartial> <bounceProcessor>bounces</bounceProcessor> </mailet> - <!-- mailet match="All" class="ToProcessor"> - <processor>relay-denied</processor> - </mailet--> </processor> <processor state="local-address-error" enableJmx="true"> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml index d3a81be..de035fb 100644 --- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml @@ -53,14 +53,6 @@ <matcher match="SentByMailet"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> <mailet match="All" class="RecipientRewriteTable" /> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml index d0cfea7..dedb391 100644 --- a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml @@ -53,27 +53,12 @@ <processor state="transport" enableJmx="true"> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> - <mailet match="All" class="RemoveMimeHeader"> - <name>bcc</name> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <!-- <mailet match="HostIsLocal" class="ToProcessor"> - <processor>local-address-error</processor> - <notice>550 - Requested action not taken: no such user here</notice> - </mailet> --> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> <delayTime>5 minutes</delayTime> @@ -88,9 +73,6 @@ <sendpartial>false</sendpartial> <bounceProcessor>bounces</bounceProcessor> </mailet> - <!-- mailet match="All" class="ToProcessor"> - <processor>relay-denied</processor> - </mailet--> </processor> <processor state="local-address-error" enableJmx="true"> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml index ae32aa6..a910f1b 100644 --- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml +++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml @@ -53,14 +53,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml index 6aef809..2bb4a95 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml @@ -54,10 +54,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml index 5cdc6b5..2eacd5c 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml @@ -55,10 +55,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml index a16cf3c..f24fd9c 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml @@ -54,10 +54,6 @@ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/> </matcher> - <mailet match="SMTPAuthSuccessful" class="SetMimeHeader"> - <name>X-UserIsAuth</name> - <value>true</value> - </mailet> <mailet match="All" class="RemoveMimeHeader"> <name>bcc</name> </mailet> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
