This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.7.x in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/3.7.x by this push: new 37346c703e [CONF] Remove vendor URLs from smtpserver.xml default configuration examples (#1205) 37346c703e is described below commit 37346c703e4799b85f7337dfe9e86e0ac719b123 Author: Benoit TELLIER <btell...@linagora.com> AuthorDate: Fri Sep 23 08:45:21 2022 +0700 [CONF] Remove vendor URLs from smtpserver.xml default configuration examples (#1205) --- .../apps/cassandra-app/sample-configuration/smtpserver.xml | 14 ++++++++++---- .../src/test/resources/smtpserver.xml | 14 ++++++++++---- .../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 ------ 8 files changed, 70 insertions(+), 34 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 0fef5ecc86..c705a0cf0e 100644 --- a/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml +++ b/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml @@ -65,12 +65,15 @@ <announce>always</announce> <requireSSL>false</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>0.0.0.0/0</authorizedAddresses> <!-- Trust authenticated users --> @@ -100,12 +103,15 @@ <announce>always</announce> <requireSSL>false</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>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 8af96e3e09..41d91615c8 100644 --- a/server/mailet/integration-testing/src/main/resources/smtpserver.xml +++ b/server/mailet/integration-testing/src/main/resources/smtpserver.xml @@ -76,12 +76,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> --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org