[java-idp-integration-tests] branch main updated: Do not use separate backchannel port

[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=f62099ce557aa6929cdeb1a59d54616a3a48081b

The following commit(s) were added to refs/heads/main by this push:
     new f62099c  Do not use separate backchannel port
f62099c is described below

commit f62099ce557aa6929cdeb1a59d54616a3a48081b
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Dec 18 17:52:53 2023 -0600

    Do not use separate backchannel port
    
    Use "secure" port instead (e.g. 443)
---
 .../idp/integration/tests/BaseIntegrationTest.java |  2 +-
 .../saml2/SAML2AttributeQueryIntegrationTest.java  | 47 +---------------------
 2 files changed, 3 insertions(+), 46 deletions(-)

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 530c20b..43ee6b6 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -775,7 +775,7 @@ public abstract class BaseIntegrationTest {
         securePort = iterator.next();
         log.debug("Selecting port '{}' for secure endpoints", securePort);
 
-        backchannelPort = iterator.next();
+        backchannelPort = securePort;
         log.debug("Selecting port '{}' for backchannel endpoint", backchannelPort);
 
         ldapPort = iterator.next();
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
index 61eec0c..9c5458a 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/saml2/SAML2AttributeQueryIntegrationTest.java
@@ -20,10 +20,8 @@ package net.shibboleth.idp.integration.tests.saml2;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -251,47 +249,6 @@ public class SAML2AttributeQueryIntegrationTest extends AbstractSAML2Integration
         uncommentFile(pathToSubjectC14nXML, toUncomment);
     }
 
-    /**
-     * Enable the SOAP endpoint.
-     * 
-     * When using Jetty, the SOAP endpoint is enabled by default.
-     * 
-     * When using Tomcat, copy the trustany JAR to lib/ and uncomment the connector
-     * in conf/server.xml.
-     * 
-     * @throws IOException
-     */
-    @BeforeClass
-    protected void enableSOAPEndpoint() throws IOException {
-
-        // Jetty
-        if (pathToJettyBase != null) {
-            final Path pathToIni = pathToJettyBase.resolve(Paths.get("start.d", "idp-backchannel.ini"));
-            Assert.assertTrue(pathToIni.toFile().exists());
-            replaceProperty(pathToIni, "--module", "idp-backchannel");
-        }
-
-        // Tomcat
-        if (pathToTomcatBase != null) {
-
-            // Copy trustany JAR to CATALINA_BASE/lib
-            final Path pathToSource = pathToTomcatBase.resolve(Paths.get("lib-extras", "trustany-ssl-1.0.0.jar"));
-            Assert.assertTrue(pathToSource.toFile().exists());
-
-            final Path pathToTarget = pathToTomcatBase.resolve(Paths.get("lib", "trustany-ssl-1.0.0.jar"));
-            Assert.assertFalse(pathToTarget.toFile().exists());
-
-            Files.copy(pathToSource, pathToTarget, StandardCopyOption.REPLACE_EXISTING);
-
-            // Add connector definition to CATALINA_BASE/conf/server.xml
-            final Path pathToServerXml = pathToTomcatBase.resolve(Paths.get("conf", "server.xml"));
-
-            final String toUncomment = "Define dedicated SOAP connector for back-channel requests";
-
-            BaseIntegrationTest.uncommentAfter(pathToServerXml, toUncomment);
-        }
-    }
-
     /**
      * Set path to client TLS certificate resource. A <code>null</code> path clears the request parameter.
      * 
@@ -473,7 +430,7 @@ public class SAML2AttributeQueryIntegrationTest extends AbstractSAML2Integration
 
         submitAttributeQueryForm();
 
-        validateResponse();
+        validateErrorResponse();
     }
 
     @Test(dataProvider = "sauceOnDemandBrowserDataProvider")
@@ -543,7 +500,7 @@ public class SAML2AttributeQueryIntegrationTest extends AbstractSAML2Integration
 
         submitAttributeQueryForm();
 
-        validateErrorResponse();
+        validateResponse();
     }
 
     @Test(dataProvider = "sauceOnDemandBrowserDataProvider")

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