This is an automated email from the ASF dual-hosted git repository.
markt 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 efeb49389e Fix BZ 67929 - TLS config reload can trigger JVM crash
efeb49389e is described below
commit efeb49389e6692120ad85ff1e0405f29099cc8ba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 2 18:26:01 2023 +0000
Fix BZ 67929 - TLS config reload can trigger JVM crash
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 6 ++++++
java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java | 5 +++++
java/org/apache/tomcat/util/net/AprEndpoint.java | 14 +++++++++-----
java/org/apache/tomcat/util/net/SSLHostConfig.java | 4 ++--
.../apache/tomcat/util/net/SSLHostConfigCertificate.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
6 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 4a17b4a95c..c01943871c 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -284,6 +284,9 @@ public abstract class AbstractEndpoint<S,U> {
}
if (replace) {
SSLHostConfig previous = sslHostConfigs.put(key, sslHostConfig);
+ if (key.equals(getDefaultSSLHostConfigName())) {
+ setDefaultSslHostConfig(sslHostConfig);
+ }
if (previous != null) {
unregisterJmx(sslHostConfig);
}
@@ -374,6 +377,9 @@ public abstract class AbstractEndpoint<S,U> {
protected abstract void createSSLContext(SSLHostConfig sslHostConfig)
throws Exception;
+ protected abstract void setDefaultSslHostConfig(SSLHostConfig
sslHostConfig);
+
+
protected void logCertificate(SSLHostConfigCertificate certificate) {
SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index 5ad2076cbd..ed3bac2160 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -272,4 +272,9 @@ public abstract class AbstractJsseEndpoint<S,U> extends
AbstractEndpoint<S,U> {
}
return null;
}
+
+
+ protected void setDefaultSslHostConfig(SSLHostConfig sslHostConfig) {
+ // NO-OP for JSSE
+ }
}
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 1d61bee3db..d9ef524bed 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -107,9 +107,9 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
/**
- * SSL context.
+ * Default SSL context. SNI callback may select a different SSL context.
*/
- protected long sslContext = 0;
+ protected volatile long sslContext = 0;
private int previousAcceptedPort = -1;
@@ -371,9 +371,7 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostConfig",
getDefaultSSLHostConfigName(), getName()));
}
- Long defaultSSLContext = defaultSSLHostConfig.getOpenSslContext();
- sslContext = defaultSSLContext.longValue();
- SSLContext.registerDefault(defaultSSLContext, this);
+ setDefaultSslHostConfig(defaultSSLHostConfig);
// For now, sendfile is not supported with SSL
if (getUseSendfile()) {
@@ -438,6 +436,12 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
}
+ protected void setDefaultSslHostConfig(SSLHostConfig sslHostConfig) {
+ Long ctx = sslHostConfig.getOpenSslContext();
+ sslContext = ctx.longValue();
+ SSLContext.registerDefault(ctx, this);
+ }
+
@Override
public boolean isAlpnSupported() {
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index c9b921026e..81c1d51f64 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -74,11 +74,11 @@ public class SSLHostConfig implements Serializable {
private String hostName = DEFAULT_SSL_HOST_NAME;
- private transient Long openSslConfContext = Long.valueOf(0);
+ private transient volatile Long openSslConfContext = Long.valueOf(0);
// OpenSSL can handle multiple certs in a single config so the reference to
// the context is here at the virtual host level. JSSE can't so the
// reference is held on the certificate.
- private transient Long openSslContext = Long.valueOf(0);
+ private transient volatile Long openSslContext = Long.valueOf(0);
private boolean tls13RenegotiationAvailable = false;
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 68a6d2d378..4b7b2a4c70 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -53,7 +53,7 @@ public class SSLHostConfigCertificate implements Serializable
{
// OpenSSL can handle multiple certs in a single config so the reference to
// the context is at the virtual host level. JSSE can't so the reference is
// held here on the certificate.
- private transient SSLContext sslContext;
+ private transient volatile SSLContext sslContext;
// Common
private final SSLHostConfig sslHostConfig;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8033523350..57fa62c0e8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,10 @@
than the combinations supported by the JVM by default. Specifically,
support the OpenSSL default of HmacSHA256 and DES-EDE3-CBC. (markt)
</fix>
+ <fix>
+ <bug>67927</bug>: Reloading TLS configuration can cause the Connector
to
+ refuse new connections or the JVM to crash. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
