You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/02/15 12:30:10 UTC
[tomcat] branch 8.5.x updated: 64141: Allow overriding JVM trust
store
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c38420b 64141: Allow overriding JVM trust store
c38420b is described below
commit c38420be523f20471a078239cf422356641cfb74
Author: remm <re...@apache.org>
AuthorDate: Sat Feb 15 13:21:53 2020 +0100
64141: Allow overriding JVM trust store
If using a CA certificate, remove a default value for the trust store
file when not using a JSSE configuration.
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 25 +++++++++++++++++++---
webapps/docs/changelog.xml | 4 ++++
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 8e6ccce..23e681e 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -154,15 +154,24 @@ public class SSLHostConfig implements Serializable {
}
- void setProperty(String name, Type configType) {
+ /**
+ * Set property which belongs to the specified configuration type.
+ * @param name the property name
+ * @param configType the configuration type
+ * @return true if the property belongs to the current configuration,
+ * and false otherwise
+ */
+ boolean setProperty(String name, Type configType) {
if (this.configType == null) {
this.configType = configType;
} else {
if (configType != this.configType) {
log.warn(sm.getString("sslHostConfig.mismatch",
name, getHostName(), configType, this.configType));
+ return false;
}
}
+ return true;
}
@@ -799,7 +808,12 @@ public class SSLHostConfig implements Serializable {
public void setCaCertificateFile(String caCertificateFile) {
- setProperty("caCertificateFile", Type.OPENSSL);
+ if (setProperty("caCertificateFile", Type.OPENSSL)) {
+ // Reset default JSSE trust store if not a JSSE configuration
+ if (truststoreFile != null) {
+ truststoreFile = null;
+ }
+ }
this.caCertificateFile = caCertificateFile;
}
@@ -810,7 +824,12 @@ public class SSLHostConfig implements Serializable {
public void setCaCertificatePath(String caCertificatePath) {
- setProperty("caCertificatePath", Type.OPENSSL);
+ if (setProperty("caCertificatePath", Type.OPENSSL)) {
+ // Reset default JSSE trust store if not a JSSE configuration
+ if (truststoreFile != null) {
+ truststoreFile = null;
+ }
+ }
this.caCertificatePath = caCertificatePath;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ff7946c..1692c46 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,6 +80,10 @@
performed, the read/write would time out rather than return immediately.
(markt)
</fix>
+ <fix>
+ <bug>64141</bug>: If using a CA certificate, remove a default value
+ for the truststore file when not using a JSSE configuration. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org