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:04 UTC

[james-project] 03/03: JAMES-3579 adjust smtpserver.xml files in James code to adapt to the new conf behavior

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