[java-idp-integration-tests] 04/04: Clean up munging of IP addresses used by Jetty

[Tom Zeller]

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=61b731f646c958998b0f0a0d7162657624a25e23

commit 61b731f646c958998b0f0a0d7162657624a25e23
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Jun 8 09:56:31 2021 -0500

    Clean up munging of IP addresses used by Jetty
    
    Now that jetty-base for Jetty 9.4+ defaults to running on all available
    IP addresses (jetty.ssl.host=0.0.0.0), no need to do anything most of
    the time.
---
 .../net/shibboleth/idp/test/BaseIntegrationTest.java     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index ed1c430..1c671db 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -767,23 +767,15 @@ public abstract class BaseIntegrationTest
         // Jetty endpoints.
         if (pathToJettyBase != null) {
             final Path pathToJettyIdPIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
-            // Jetty 9.3
-            replaceProperty(pathToJettyIdPIni, "jetty.host", privateSecureAddress);
-            replaceProperty(pathToJettyIdPIni, "jetty.https.port", Integer.toString(securePort));
-            replaceProperty(pathToJettyIdPIni, "jetty.backchannel.host", privateSecureAddress);
-            replaceProperty(pathToJettyIdPIni, "jetty.backchannel.port", Integer.toString(backchannelPort));
-
-            // Jetty 9.4 https host and port
-            replaceProperty(pathToJettyIdPIni, "jetty.ssl.host", privateSecureAddress);
+
+            // Jetty with jetty-base 9.4+ listens on all addresses by default
+
+            // Set SSL port to public secure port
             replaceProperty(pathToJettyIdPIni, "jetty.ssl.port", Integer.toString(securePort));
 
             // Jetty 9.4 backchannel host and port
             final Path backchannelIni = pathToJettyBase.resolve(Paths.get("start.d", "idp-backchannel.ini"));
             if (backchannelIni.toAbsolutePath().toFile().exists()) {
-                // 'jetty.backchannel' properties are deprecated and replaced with 'idp.backchannel'. 
-                replaceProperty(backchannelIni, "jetty.backchannel.host", privateSecureAddress);
-                replaceProperty(backchannelIni, "jetty.backchannel.port", Integer.toString(backchannelPort));
-                replaceProperty(backchannelIni, "idp.backchannel.host", privateSecureAddress);
                 replaceProperty(backchannelIni, "idp.backchannel.port", Integer.toString(backchannelPort));
             }
         }

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