From 5d29b1ab091b49a716fa6b1970fb9a776e2d4aa7 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 12 Oct 2023 21:25:40 +0000
Subject: [PATCH] fix tests

---
 .../container_files/config/tomcat/server.xml  | 26 ++++++++++++++-----
 tests/fulltest.sh                             |  2 +-
 2 files changed, 21 insertions(+), 7 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..a5b21a9 100644
--- a/test-compose/idp/container_files/config/tomcat/server.xml
+++ b/test-compose/idp/container_files/config/tomcat/server.xml
@@ -4,12 +4,26 @@
   <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"
+               defaultSSLHostConfigName="IdP">
+      <SSLHostConfig hostName="IdP"
+          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
+            certificateFile="/opt/certs/idp-default.crt" 
+	    certificateKeyFile="/opt/certs/idp-default.key" />
+      </SSLHostConfig>
+      <!--<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />-->
+    </Connector>
+
     <Engine name="Catalina" defaultHost="localhost">
 
       <Host name="localhost"  appBase="webapps"
diff --git a/tests/fulltest.sh b/tests/fulltest.sh
index c529499..9f0814b 100755
--- a/tests/fulltest.sh
+++ b/tests/fulltest.sh
@@ -33,7 +33,7 @@ fi
 
 # replace FROM line in IdP Dockerfile to newly-built local image
 echo "Setting test suite to base from new IdP image: ${imagename}_${tag}"
-sed -i "s*FROM i2incommon/shib-idp:latest*FROM ${imagename}_${tag}*g" ../test-compose/idp/Dockerfile
+sed -i "s*FROM i2incommon/shib-idp:latest5*FROM ${imagename}_${tag}*g" ../test-compose/idp/Dockerfile
 
 echo "Attempting full-cycle test..."