This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 08bdec1243c2829d846b349a6c4ec4fc5152491d Author: Mark Thomas <[email protected]> AuthorDate: Wed May 13 12:30:01 2026 +0100 More explicit message and log at error rather than warning Increase visibility as all certificates will be trusted in this configuration. --- .../catalina/tribes/membership/cloud/AbstractStreamProvider.java | 2 +- .../apache/catalina/tribes/membership/cloud/LocalStrings.properties | 2 +- webapps/docs/changelog.xml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java index 4add05b8d1..d0efb464e8 100644 --- a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java +++ b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java @@ -184,7 +184,7 @@ public abstract class AbstractStreamProvider implements StreamProvider { throw e; } } else { - log.warn(sm.getString("abstractStream.CACertUndefined")); + log.error(sm.getString("abstractStream.CACertUndefined")); return INSECURE_TRUST_MANAGERS; } } diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties index 4febddf80a..1448122345 100644 --- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties +++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -abstractStream.CACertUndefined=CA cert file undefined +abstractStream.CACertUndefined=CA cert file undefined. All certificates will be trusted. abstractStream.connection=[{0}] opening connection: url [{1}], connectTimeout [{2}], readTimeout [{3}] abstractStream.fileNotFound=CA cert file [{0}] not found abstractStream.invalidTimeout=Neither connectTimeout [{0}] nor readTimeout [{1}] can be less than 0 for URLConnection diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 172556c33d..9efb014883 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -305,6 +305,11 @@ <code>AES/GCM/NoPadding</code>. (markt) </scode> <!-- Entries for backport and removal before 12.0.0-M1 below this line --> + <fix> + Expand wording and increase visibility of log message when cloud + membership is configured without a trust store as all certificates will + be trusted in this configuration. (markt) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
