[java-idp-integration-tests] branch main updated: Listen for HTTPS on all addresses for Tomcat

Tom Zeller tzeller at dragonacea.biz
Sun Dec 31 14:11:26 UTC 2023


This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=32fcbb7981846e04d9e314d40b713ef74b1a2717

The following commit(s) were added to refs/heads/main by this push:
     new 32fcbb7  Listen for HTTPS on all addresses for Tomcat
32fcbb7 is described below

commit 32fcbb7981846e04d9e314d40b713ef74b1a2717
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sun Dec 31 08:11:16 2023 -0600

    Listen for HTTPS on all addresses for Tomcat
    
    Otherwise Tomcat will fail to start when running on EC2 for Sauce Labs
    browser tests since the secure public address is not actually bind-able.
---
 .../java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index b2f6f5e..3735a49 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -887,7 +887,8 @@ public abstract class BaseIntegrationTest {
             final Path pathToCatalinaProperties = pathToTomcatBase.resolve(Paths.get("conf", "catalina.properties"));
             replaceFile(pathToCatalinaProperties, "tomcat.http.host=.*", "tomcat.http.host=" + privateSecureAddress);
             replaceFile(pathToCatalinaProperties, "tomcat.http.port=.*", "tomcat.http.port=" + Integer.toString(port));
-            replaceFile(pathToCatalinaProperties, "tomcat.https.host=.*", "tomcat.https.host=" + secureAddress);
+            // Our tomcat-base listens for HTTPS on all addresses by default
+            // replaceFile(pathToCatalinaProperties, "tomcat.https.host=.*", "tomcat.https.host=" + secureAddress);
             replaceFile(pathToCatalinaProperties, "tomcat.https.port=.*", "tomcat.https.port=" + Integer.toString(securePort));
             replaceFile(pathToCatalinaProperties, "tomcat.backchannel.port=.*", "tomcat.backchannel.port=" + Integer.toString(backchannelPort));
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list