You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/12/08 10:40:07 UTC
[12/13] james-project git commit: JAMES-2246 Update configurations
JAMES-2246 Update configurations
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0ce56b7e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0ce56b7e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0ce56b7e
Branch: refs/heads/master
Commit: 0ce56b7e5a9648251e8199913061e1155ad9bb8b
Parents: 4b5c18c
Author: benwa <bt...@linagora.com>
Authored: Wed Dec 6 17:45:57 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Dec 8 17:35:50 2017 +0700
----------------------------------------------------------------------
.../guice/cassandra-ldap/destination/conf/mailetcontainer.xml | 3 +++
.../run/guice/cassandra-ldap/destination/conf/smtpserver.xml | 6 +++---
.../run/guice/cassandra/destination/conf/mailetcontainer.xml | 3 +++
.../run/guice/cassandra/destination/conf/smtpserver.xml | 6 +++---
dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml | 3 +++
dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml | 6 +++---
dockerfiles/run/spring/destination/conf/mailetcontainer.xml | 3 +++
dockerfiles/run/spring/destination/conf/smtpserver.xml | 6 +++---
mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml | 3 ---
.../apache/james/smtp/scripts/data_starts_with_starttls.test | 2 ++
.../org/apache/james/smtp/scripts/data_with_starttls.test | 2 ++
.../org/apache/james/smtp/scripts/rcpt_with_starttls.test | 2 ++
.../main/resources/org/apache/james/smtp/scripts/starttls.test | 2 ++
.../org/apache/james/smtp/scripts/starttls_with_injection.test | 2 ++
.../guice/cassandra-guice/src/test/resources/smtpserver.xml | 3 ---
.../cassandra-ldap-guice/src/test/resources/smtpserver.xml | 3 ---
.../guice/jpa-guice/src/test/resources/smtpserver.xml | 3 ---
.../container/guice/jpa-smtp/src/test/resources/smtpserver.xml | 3 ---
.../guice/memory-guice/src/test/resources/mailetcontainer.xml | 3 +++
.../guice/memory-guice/src/test/resources/smtpserver.xml | 3 ---
.../src/test/resources/mailetcontainer.xml | 3 +++
.../src/test/resources/smtpserver.xml | 3 ---
.../src/test/resources/mailetcontainer.xml | 3 +++
.../src/test/resources/smtpserver.xml | 3 ---
24 files changed, 43 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 5a45d3e..f1f7de4 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -73,6 +73,9 @@
<mailet match="SMTPAuthSuccessful" class="ToProcessor">
<processor>relay</processor>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
<mailet match="org.apache.james.jmap.mailet.SentByJmap" class="ToProcessor">
<processor>relay</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
index bc609be..e464ca6 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +61,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +89,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 d766643..f453b77 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -73,6 +73,9 @@
<mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
+ <RelayAllowed>true</RelayAllowed>
+ </mailet>
<mailet match="SentByMailet" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml b/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml
index bc609be..e464ca6 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +61,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +89,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 cc18299..3872dd8 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -72,6 +72,9 @@
<mailet match="SMTPAuthSuccessful" class="ToProcessor">
<processor>relay</processor>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
<mailet match="SentByMailet" class="ToProcessor">
<processor>relay</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml b/dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml
index bc609be..e464ca6 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +61,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +89,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 2998503..4793203 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -72,6 +72,9 @@
<mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
+ <RelayAllowed>true</RelayAllowed>
+ </mailet>
<mailet match="SentByMailet" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/dockerfiles/run/spring/destination/conf/smtpserver.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/smtpserver.xml b/dockerfiles/run/spring/destination/conf/smtpserver.xml
index bc609be..e464ca6 100644
--- a/dockerfiles/run/spring/destination/conf/smtpserver.xml
+++ b/dockerfiles/run/spring/destination/conf/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +61,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +89,7 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
index c2b31b5..b5a4608 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
@@ -35,7 +35,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -62,7 +61,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -90,7 +88,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
index 22b1fff..88c656f 100644
--- a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
@@ -4,6 +4,8 @@ C: mail from:<ma...@yopmail.com>
C: rcpt to:<bo...@mydomain.tld>
C: data
S: 250.*
+S: 250-AUTH LOGIN PLAIN
+S: 250-AUTH=LOGIN PLAIN
S: 250-PIPELINING
S: 250-ENHANCEDSTATUSCODES
S: 250-8BITMIME
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
index edd3a40..c25db1b 100644
--- a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
@@ -4,6 +4,8 @@ C: mail from:<ma...@yopmail.com>
C: rcpt to:<bo...@mydomain.tld>
C: data
S: 250.*
+S: 250-AUTH LOGIN PLAIN
+S: 250-AUTH=LOGIN PLAIN
S: 250-PIPELINING
S: 250-ENHANCEDSTATUSCODES
S: 250-8BITMIME
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
index efe719b..5b6de69 100644
--- a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
@@ -4,6 +4,8 @@ C: mail from:<ma...@yopmail.com>
C: rcpt to:<st...@mydomain.tld>
C: data
S: 250.*
+S: 250-AUTH LOGIN PLAIN
+S: 250-AUTH=LOGIN PLAIN
S: 250-PIPELINING
S: 250-ENHANCEDSTATUSCODES
S: 250-8BITMIME
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls.test
index abcb5c9..d71186b 100644
--- a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls.test
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls.test
@@ -2,6 +2,8 @@ S: 220 mydomain.tld smtp
C: ehlo yopmail.com
S: 250.*
+S: 250-AUTH LOGIN PLAIN
+S: 250-AUTH=LOGIN PLAIN
S: 250-PIPELINING
S: 250-ENHANCEDSTATUSCODES
S: 250-8BITMIME
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls_with_injection.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls_with_injection.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls_with_injection.test
index 5c09717..90068f6 100644
--- a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls_with_injection.test
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/starttls_with_injection.test
@@ -2,6 +2,8 @@ S: 220 mydomain.tld smtp
C: ehlo yopmail.com
S: 250.*
+S: 250-AUTH LOGIN PLAIN
+S: 250-AUTH=LOGIN PLAIN
S: 250-PIPELINING
S: 250-ENHANCEDSTATUSCODES
S: 250-8BITMIME
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml b/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml b/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml b/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml
+++ b/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml
index 04ffa3e..887dab3 100644
--- a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml
@@ -64,6 +64,9 @@
<mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
+ <RelayAllowed>true</RelayAllowed>
+ </mailet>
<mailet match="SentByMailet" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/container/guice/memory-guice/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/resources/smtpserver.xml b/server/container/guice/memory-guice/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/container/guice/memory-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/memory-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 b998dcd..dbcf81b 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
@@ -61,6 +61,9 @@
<mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
+ <RelayAllowed>true</RelayAllowed>
+ </mailet>
<mailet match="SentByMailet" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/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 7b421ca..fe07346 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
@@ -61,6 +61,9 @@
<mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
+ <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
+ <RelayAllowed>true</RelayAllowed>
+ </mailet>
<mailet match="SentByMailet" class="SetMailAttribute">
<RelayAllowed>true</RelayAllowed>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ce56b7e/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml
index a3d4b8f..2f83c8e 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml
@@ -34,7 +34,6 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<verifyIdentity>true</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -61,7 +60,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
@@ -89,7 +87,6 @@
Authorize only local users
-->
<authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org