Prepare Tomcat 10 update

fix #677 Add SSLHostConfig which is a must https://tomcat.apache.org/tomcat-10.0-doc/ssl-howto.html https://tomcat.apache.org/tomcat-9.0-doc/config/http.html#Key_store_types
cloudfoundry · Aug 9, 2024 · 890d103 · 890d103
1 parent 2fa6c8d
commit 890d103
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/jobs/uaa/templates/config/tomcat/tomcat.server.xml.erb b/jobs/uaa/templates/config/tomcat/tomcat.server.xml.erb
@@ -70,12 +70,14 @@
                clientAuth="false"
                sslProtocol="TLS"
                keystoreFile="/var/vcap/data/uaa/uaa_keystore.p12"
-               keystoreType="PKCS12"
-               keyAlias="uaa_ssl_cert"
-               keystorePass="k0*l*s3cur1tyr0ck$"
+               defaultSSLHostConfigName="localhost"
                bindOnInit="false"
-               maxHttpHeaderSize="14336"
-    />
+               maxHttpHeaderSize="14336">
+      <SSLHostConfig hostName="localhost" protocols="<%= p('uaa.ssl.enabled_protocols') %>">
+        <Certificate certificateKeystoreFile="/var/vcap/data/uaa/uaa_keystore.p12" certificateKeyAlias="uaa_ssl_cert"
+                     type="RSA" certificateKeystoreType="PKCS12"  certificateKeystorePassword="k0*l*s3cur1tyr0ck$"/>
+      </SSLHostConfig>
+    </Connector>
 
     <Engine name="Catalina" defaultHost="localhost">
 

diff --git a/spec/compare/all-properties-tomcat-server.xml b/spec/compare/all-properties-tomcat-server.xml
@@ -27,12 +27,14 @@
                clientAuth="false"
                sslProtocol="TLS"
                keystoreFile="/var/vcap/data/uaa/uaa_keystore.p12"
-               keystoreType="PKCS12"
-               keyAlias="uaa_ssl_cert"
-               keystorePass="k0*l*s3cur1tyr0ck$"
+               defaultSSLHostConfigName="localhost"
                bindOnInit="false"
-               maxHttpHeaderSize="14336"
-    />
+               maxHttpHeaderSize="14336">
+      <SSLHostConfig hostName="localhost" protocols="TLSv1.2,TLSv1.3">
+        <Certificate certificateKeystoreFile="/var/vcap/data/uaa/uaa_keystore.p12" certificateKeyAlias="uaa_ssl_cert"
+                     type="RSA" certificateKeystoreType="PKCS12"  certificateKeystorePassword="k0*l*s3cur1tyr0ck$"/>
+      </SSLHostConfig>
+    </Connector>
 
     <Engine name="Catalina" defaultHost="localhost">
       <Host name="localhost"