You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/05/13 07:54:01 UTC
[james-project] branch master updated (cb52bec -> b94aedf)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from cb52bec [REFACTORING] Pass Mime message when available down in MessageManager::append
new df8fb17 JAMES-3579 No need to assign authRequired twice
new b3fa7a3 JAMES-3579 reject verifyIdentity param to true when authRequired is false in SMTP server configuration
new b94aedf JAMES-3579 adjust smtpserver.xml files in James code to adapt to the new conf behavior
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cassandra/package/etc/james/templates/smtpserver.xml | 2 +-
dockerfiles/run/spring/destination/conf/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml | 2 +-
.../cli-integration/src/test/resources/smtpserver.xml | 2 +-
.../cassandra-guice/sample-configuration/smtpserver.xml | 2 +-
.../cassandra-guice/src/test/resources/smtpserver.xml | 2 +-
.../cassandra-ldap-guice/src/test/resources/smtpserver.xml | 2 +-
.../sample-configuration/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../guice/jpa-guice/sample-configuration/smtpserver.xml | 2 +-
.../guice/jpa-guice/src/test/resources/smtpserver.xml | 2 +-
.../jpa-smtp-mariadb/sample-configuration/smtpserver.xml | 2 +-
.../jpa-smtp-mariadb/src/test/resources/smtpserver.xml | 2 +-
.../guice/jpa-smtp/sample-configuration/smtpserver.xml | 2 +-
.../guice/jpa-smtp/src/test/resources/smtpserver.xml | 2 +-
.../guice/memory-guice/sample-configuration/smtpserver.xml | 2 +-
.../guice/memory-guice/src/test/resources/smtpserver.xml | 2 +-
.../james/mailets/configuration/SmtpConfiguration.java | 2 +-
.../james/mailets/configuration/SmtpConfigurationTest.java | 4 ++--
.../apache/james/smtp/SmtpIdentityVerificationTest.java | 11 -----------
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../java/org/apache/james/smtpserver/netty/SMTPServer.java | 10 +++++-----
.../java/org/apache/james/smtpserver/SMTPServerTest.java | 14 +++++++++++++-
.../org/apache/james/smtpserver/SMTPTestConfiguration.java | 4 ++++
.../webadmin-cli/src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
31 files changed, 50 insertions(+), 45 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 03/03: JAMES-3579 adjust smtpserver.xml files in
James code to adapt to the new conf behavior
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b94aedfec6950ea79ad1db17b213b08719603b4c
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue May 11 12:31:26 2021 +0700
JAMES-3579 adjust smtpserver.xml files in James code to adapt to the new conf behavior
---
.../cassandra/package/etc/james/templates/smtpserver.xml | 2 +-
dockerfiles/run/spring/destination/conf/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml | 2 +-
.../cli-integration/src/test/resources/smtpserver.xml | 2 +-
.../guice/cassandra-guice/sample-configuration/smtpserver.xml | 2 +-
.../guice/cassandra-guice/src/test/resources/smtpserver.xml | 2 +-
.../cassandra-ldap-guice/src/test/resources/smtpserver.xml | 2 +-
.../sample-configuration/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../guice/jpa-guice/sample-configuration/smtpserver.xml | 2 +-
.../guice/jpa-guice/src/test/resources/smtpserver.xml | 2 +-
.../jpa-smtp-mariadb/sample-configuration/smtpserver.xml | 2 +-
.../guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml | 2 +-
.../guice/jpa-smtp/sample-configuration/smtpserver.xml | 2 +-
.../guice/jpa-smtp/src/test/resources/smtpserver.xml | 2 +-
.../guice/memory-guice/sample-configuration/smtpserver.xml | 2 +-
.../guice/memory-guice/src/test/resources/smtpserver.xml | 2 +-
.../apache/james/mailets/configuration/SmtpConfiguration.java | 2 +-
.../james/mailets/configuration/SmtpConfigurationTest.java | 4 ++--
.../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 11 -----------
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../protocols/webadmin-cli/src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
.../src/test/resources/smtpserver.xml | 2 +-
28 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/smtpserver.xml b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/smtpserver.xml
index dd650e4..2026338 100644
--- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/smtpserver.xml
+++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/dockerfiles/run/spring/destination/conf/smtpserver.xml b/dockerfiles/run/spring/destination/conf/smtpserver.xml
index bf052df..cd08571 100644
--- a/dockerfiles/run/spring/destination/conf/smtpserver.xml
+++ b/dockerfiles/run/spring/destination/conf/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
index bcc18b7..31b5d84 100644
--- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>mydomain.tld smtp</smtpGreeting>
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
index bcc18b7..31b5d84 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>mydomain.tld smtp</smtpGreeting>
diff --git a/server/container/cli-integration/src/test/resources/smtpserver.xml b/server/container/cli-integration/src/test/resources/smtpserver.xml
index 66cc7e8..61429fe 100644
--- a/server/container/cli-integration/src/test/resources/smtpserver.xml
+++ b/server/container/cli-integration/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml b/server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml
index 722b0c2..9200f23 100644
--- a/server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml
@@ -37,7 +37,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
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 d91f6ac..dba8fcb 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,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
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 d91f6ac..dba8fcb 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,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml b/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml
index 722b0c2..9200f23 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml
@@ -37,7 +37,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml
index d91f6ac..dba8fcb 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml
index d91f6ac..dba8fcb 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/jpa-guice/sample-configuration/smtpserver.xml b/server/container/guice/jpa-guice/sample-configuration/smtpserver.xml
index 722b0c2..9200f23 100644
--- a/server/container/guice/jpa-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/jpa-guice/sample-configuration/smtpserver.xml
@@ -37,7 +37,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
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 d91f6ac..dba8fcb 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,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml
index 814575a..7946218 100644
--- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml
+++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml b/server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml
index 98d63c6..4fb392d 100644
--- a/server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml
+++ b/server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml b/server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml
index 722b0c2..9200f23 100644
--- a/server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml
+++ b/server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml
@@ -37,7 +37,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
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 d91f6ac..dba8fcb 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,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
index 722b0c2..9200f23 100644
--- a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
@@ -37,7 +37,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
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 d91f6ac..dba8fcb 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,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/SmtpConfiguration.java b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
index 3a61c48..c0f90e9 100644
--- a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
+++ b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
@@ -114,7 +114,7 @@ public class SmtpConfiguration implements SerializableAsXml {
return new SmtpConfiguration(authorizedAddresses,
authRequired.orElse(!AUTH_REQUIRED),
bracketEnforcement.orElse(true),
- verifyIndentity.orElse(true),
+ verifyIndentity.orElse(false),
maxMessageSizeInKb.orElse(DEFAULT_DISABLED),
addittionalHooks.build());
}
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfigurationTest.java
index 2bb3b0a..8097003 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfigurationTest.java
@@ -147,9 +147,9 @@ public class SmtpConfigurationTest {
}
@Test
- public void verifyIdentityShouldBeEnforcedByDefault() throws IOException {
+ public void verifyIdentityShouldBeDisabledByDefault() throws IOException {
assertThat(SmtpConfiguration.DEFAULT.serializeAsXml(),
hasXPath("/smtpservers/smtpserver/verifyIdentity/text()",
- is("true")));
+ is("false")));
}
}
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
index f49abda..14e07fa 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
@@ -104,17 +104,6 @@ class SmtpIdentityVerificationTest {
}
@Test
- void verifyIdentityShouldAcceptNullSenderWhenNotAuthenticated(@TempDir File temporaryFolder) throws Exception {
- createJamesServer(temporaryFolder, SmtpConfiguration.builder()
- .verifyIdentity());
-
- assertThatCode(() ->
- messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
- .sendMessageNoSender(USER))
- .doesNotThrowAnyException();
- }
-
- @Test
void verifyIdentityShouldAcceptNullSenderWhenAuthenticationRequired(@TempDir File temporaryFolder) throws Exception {
createJamesServer(temporaryFolder, SmtpConfiguration.builder()
.requireAuthentication()
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
index b6f0d24..d62267a 100644
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
index d91f6ac..dba8fcb 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
index b6f0d24..d62267a 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
@@ -34,7 +34,7 @@
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/protocols/webadmin-cli/src/test/resources/smtpserver.xml b/server/protocols/webadmin-cli/src/test/resources/smtpserver.xml
index 66cc7e8..61429fe 100644
--- a/server/protocols/webadmin-cli/src/test/resources/smtpserver.xml
+++ b/server/protocols/webadmin-cli/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
index b0230ac..bbad9a8 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
index 66cc7e8..61429fe 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
@@ -35,7 +35,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<authRequired>false</authRequired>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
+ <verifyIdentity>false</verifyIdentity>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
<smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/03: JAMES-3579 No need to assign authRequired
twice
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit df8fb17d9fa37116d717cfeac3d15c9e12b43a54
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue May 11 11:07:35 2021 +0700
JAMES-3579 No need to assign authRequired twice
This is done above already.
---
.../src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
index cc5379a..e01b0a0 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
@@ -178,10 +178,6 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
heloEhloEnforcement = configuration.getBoolean("heloEhloEnforcement", true);
- if (authRequiredString.equals("true")) {
- authRequired = AUTH_REQUIRED;
- }
-
// get the smtpGreeting
smtpGreeting = configuration.getString("smtpGreeting", null);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/03: JAMES-3579 reject verifyIdentity param to
true when authRequired is false in SMTP server configuration
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b3fa7a3815843caa8eb1520a6b1f77a7d2cea410
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue May 11 11:37:36 2021 +0700
JAMES-3579 reject verifyIdentity param to true when authRequired is false in SMTP server configuration
---
.../java/org/apache/james/smtpserver/netty/SMTPServer.java | 6 +++++-
.../java/org/apache/james/smtpserver/SMTPServerTest.java | 14 +++++++++++++-
.../org/apache/james/smtpserver/SMTPTestConfiguration.java | 4 ++++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
index e01b0a0..0dfa355 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
@@ -183,8 +183,12 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
addressBracketsEnforcement = configuration.getBoolean("addressBracketsEnforcement", true);
- verifyIdentity = configuration.getBoolean("verifyIdentity", true);
+ verifyIdentity = configuration.getBoolean("verifyIdentity", false);
+ if (authRequired == AUTH_DISABLED && verifyIdentity) {
+ throw new ConfigurationException(
+ "SMTP configuration: 'verifyIdentity' can't be set to true if 'authRequired' is set to false.");
+ }
}
}
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index 953068b..acf718f 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -20,6 +20,7 @@ package org.apache.james.smtpserver;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Fail.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -42,6 +43,7 @@ import java.util.List;
import javax.mail.internet.MimeMessage;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.net.ProtocolCommandEvent;
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.smtp.SMTPClient;
@@ -371,7 +373,9 @@ public class SMTPServerTest {
@AfterEach
public void tearDown() {
- smtpServer.destroy();
+ if (smtpServer.isStarted()) {
+ smtpServer.destroy();
+ }
hashedWheelTimer.stop();
}
@@ -2059,4 +2063,12 @@ public class SMTPServerTest {
out.close();
client.close();
}
+
+ @Test
+ public void testRejectVerifyIdentityWhenAuthRequiredIsFalse() {
+ smtpConfiguration.setVerifyIdentity();
+
+ assertThatThrownBy(() -> init(smtpConfiguration))
+ .isInstanceOf(ConfigurationException.class);
+ }
}
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
index 9bde7e9..ba8f589 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
@@ -108,6 +108,10 @@ public class SMTPTestConfiguration extends BaseHierarchicalConfiguration {
startTLS = true;
}
+ public void setVerifyIdentity() {
+ verifyIdentity = true;
+ }
+
public void init() {
addProperty("[@enabled]", true);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org