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 2022/09/23 01:45:15 UTC
[james-project] branch master updated: [CONF] Remove vendor URLs from smtpserver.xml default configuration examples (#1204)
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
The following commit(s) were added to refs/heads/master by this push:
new e11041369c [CONF] Remove vendor URLs from smtpserver.xml default configuration examples (#1204)
e11041369c is described below
commit e11041369cb3c18f5cbae7e0552e423cf16f6c22
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Fri Sep 23 08:45:10 2022 +0700
[CONF] Remove vendor URLs from smtpserver.xml default configuration examples (#1204)
---
.../apps/cassandra-app/sample-configuration/smtpserver.xml | 14 ++++++++++----
.../src/test/resources/smtpserver.xml | 12 ------------
.../distributed-app/sample-configuration/smtpserver.xml | 14 ++++++++++----
.../sample-configuration/smtpserver.xml | 14 ++++++++++----
server/apps/jpa-app/sample-configuration/smtpserver.xml | 14 ++++++++++----
.../apps/jpa-smtp-app/sample-configuration/smtpserver.xml | 14 ++++++++++----
server/apps/memory-app/sample-configuration/smtpserver.xml | 14 ++++++++++----
.../integration-testing/src/main/resources/smtpserver.xml | 6 ------
.../spamassassin/sample-configuration/smtpserver.xml | 14 ++++++++++----
9 files changed, 70 insertions(+), 46 deletions(-)
diff --git a/server/apps/cassandra-app/sample-configuration/smtpserver.xml b/server/apps/cassandra-app/sample-configuration/smtpserver.xml
index 1de4a16246..ebe49a44b3 100644
--- a/server/apps/cassandra-app/sample-configuration/smtpserver.xml
+++ b/server/apps/cassandra-app/sample-configuration/smtpserver.xml
@@ -90,12 +90,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -138,12 +141,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml b/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
index c757c41557..0ecb662fd6 100644
--- a/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
@@ -66,12 +66,6 @@
<announce>always</announce>
<requireSSL>false</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
- <oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
- <claim>email</claim>
- <scope>openid profile email</scope>
- </oidc>
</auth>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -102,12 +96,6 @@
<announce>always</announce>
<requireSSL>false</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
- <oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
- <claim>email</claim>
- <scope>openid profile email</scope>
- </oidc>
</auth>
<authorizedAddresses>0.0.0.0/0</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/distributed-app/sample-configuration/smtpserver.xml b/server/apps/distributed-app/sample-configuration/smtpserver.xml
index e0c5c68da0..74bed8ea40 100644
--- a/server/apps/distributed-app/sample-configuration/smtpserver.xml
+++ b/server/apps/distributed-app/sample-configuration/smtpserver.xml
@@ -90,12 +90,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -135,12 +138,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/distributed-pop3-app/sample-configuration/smtpserver.xml b/server/apps/distributed-pop3-app/sample-configuration/smtpserver.xml
index b7472f5758..15afce28bf 100644
--- a/server/apps/distributed-pop3-app/sample-configuration/smtpserver.xml
+++ b/server/apps/distributed-pop3-app/sample-configuration/smtpserver.xml
@@ -67,12 +67,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -102,12 +105,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/jpa-app/sample-configuration/smtpserver.xml b/server/apps/jpa-app/sample-configuration/smtpserver.xml
index 26f418902c..b3adb9755c 100644
--- a/server/apps/jpa-app/sample-configuration/smtpserver.xml
+++ b/server/apps/jpa-app/sample-configuration/smtpserver.xml
@@ -87,12 +87,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -132,12 +135,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml b/server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml
index 26f418902c..b3adb9755c 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml
+++ b/server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml
@@ -87,12 +87,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -132,12 +135,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/apps/memory-app/sample-configuration/smtpserver.xml b/server/apps/memory-app/sample-configuration/smtpserver.xml
index 26f418902c..b3adb9755c 100644
--- a/server/apps/memory-app/sample-configuration/smtpserver.xml
+++ b/server/apps/memory-app/sample-configuration/smtpserver.xml
@@ -87,12 +87,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -132,12 +135,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
diff --git a/server/mailet/integration-testing/src/main/resources/smtpserver.xml b/server/mailet/integration-testing/src/main/resources/smtpserver.xml
index 8fe58aed96..4f0a039742 100644
--- a/server/mailet/integration-testing/src/main/resources/smtpserver.xml
+++ b/server/mailet/integration-testing/src/main/resources/smtpserver.xml
@@ -77,12 +77,6 @@
<auth>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
- <oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
- <claim>email</claim>
- <scope>openid profile email</scope>
- </oidc>
</auth>
<!-- Trust authenticated users -->
<verifyIdentity>false</verifyIdentity>
diff --git a/third-party/spamassassin/sample-configuration/smtpserver.xml b/third-party/spamassassin/sample-configuration/smtpserver.xml
index 1909b95be1..3667098789 100644
--- a/third-party/spamassassin/sample-configuration/smtpserver.xml
+++ b/third-party/spamassassin/sample-configuration/smtpserver.xml
@@ -88,12 +88,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
@@ -134,12 +137,15 @@
<announce>forUnauthorizedAddresses</announce>
<requireSSL>true</requireSSL>
<plainAuthEnabled>true</plainAuthEnabled>
+ <!-- Sample OIDC configuration -->
+ <!--
<oidc>
- <oidcConfigurationURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
- <jwksURL>https://auth.upn.integration-open-paas.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
+ <oidcConfigurationURL>https://changeme.org/auth/realms/upn/.well-known/openid-configuration</oidcConfigurationURL>
+ <jwksURL>https://changeme.org/auth/realms/upn/protocol/openid-connect/certs</jwksURL>
<claim>email</claim>
<scope>openid profile email</scope>
</oidc>
+ -->
</auth>
<authorizedAddresses>127.0.0.0/8</authorizedAddresses>
<!-- Trust authenticated users -->
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org