From 9c579a5b5e9e7327f8098374e8eacfe28054e2f4 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 26 Sep 2023 06:53:38 -0500
Subject: [PATCH] Update server.xml

---
 .../container_files/config/tomcat/server.xml  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/test-compose/idp/container_files/config/tomcat/server.xml b/test-compose/idp/container_files/config/tomcat/server.xml
index d0df37e..fba3077 100644
--- a/test-compose/idp/container_files/config/tomcat/server.xml
+++ b/test-compose/idp/container_files/config/tomcat/server.xml
@@ -4,12 +4,22 @@
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
 
   <Service name="Catalina">
-<Connector
-          protocol="org.apache.coyote.http11.Http11NioProtocol"
-          port="443" maxThreads="200"
-          scheme="https" secure="true" SSLEnabled="true"
-          keystoreFile="/opt/certs/keystore.jks" keystorePass="e68cb9bc-bb21-4319-a664-1f755ad8b47c"
-          clientAuth="false" sslProtocol="TLS"/>
+        <Connector
+        protocol="org.apache.coyote.http11.Http11NioProtocol"
+        port="443" maxThreads="200"
+        scheme="https" secure="true" SSLEnabled="true">
+      <SSLHostConfig
+          ciphers="ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
+          disableSessionTickets="true"
+          honorCipherOrder="false"
+          protocols="TLSv1.2,TLSv1.3">
+        <Certificate
+            certificateKeystoreFile="/opt/certs/keystore.jks" 
+            certificateKeystorePassword="e68cb9bc-bb21-4319-a664-1f755ad8b47c" />
+      </SSLHostConfig>
+      <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+    </Connector>
+    
     <Engine name="Catalina" defaultHost="localhost">
 
       <Host name="localhost"  appBase="webapps"