[java-idp-tomcat-base] 04/07: Enable command line tools and disable the backchannel

[Tom Zeller]

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

tzeller pushed a commit to branch 9.0
in repository java-idp-tomcat-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=f10017b7b35f5f11e6a49083284866c271ac012d

commit f10017b7b35f5f11e6a49083284866c271ac012d
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue May 2 17:15:19 2023 -0500

    Enable command line tools and disable the backchannel
---
 .../resources/tomcat-base/conf/catalina.properties     |   9 +++++++--
 src/main/resources/tomcat-base/conf/server.xml         |  17 +++++++++++------
 .../{lib => lib-extras}/trustany-ssl-1.0.0.jar         | Bin
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/src/main/resources/tomcat-base/conf/catalina.properties
index 6b27413..cfd37c2 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -365,10 +365,14 @@ tomcat.util.buf.StringCache.byte.enabled=true
 # Shibboleth IdP properties
 #
 
-# The interface to listen on. To listen on all interfaces, set tomcat.host = 0.0.0.0
-tomcat.host=localhost
+# HTTP connector
+# Allows use of default IdP command line tools.
+tomcat.http.host=127.0.0.1
+tomcat.http.port=80
 
 # The HTTPS connector
+# The interface to listen on. To listen on all interfaces, set tomcat.host = 0.0.0.0
+tomcat.https.host=0.0.0.0
 tomcat.https.port=443
 tomcat.https.certificateKeystoreFile=credentials/idp-userfacing.p12
 tomcat.https.certificateKeystorePassword=changeit
@@ -379,5 +383,6 @@ tomcat.backchannel.keystoreFile=credentials/idp-backchannel.p12
 tomcat.backchannel.keystorePass=changeit
 tomcat.backchannel.keystoreType=PKCS12
 
+# Shutdown port and password
 tomcat.shutdown.port=8005
 tomcat.shutdown.password=SHUTDOWN
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/src/main/resources/tomcat-base/conf/server.xml
index abb1527..0aa64c3 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -66,11 +66,14 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
     -->
-    <!-- 
-    <Connector port="8080" protocol="HTTP/1.1"
+
+    <!-- Allows use of default IdP command line tools. -->
+    <Connector address="${tomcat.http.host}"
+               port="${tomcat.http.port}"
+               protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
+               redirectPort="${tomcat.https.port}" />
+
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
@@ -114,9 +117,9 @@
     -->
 
     <Connector
+        address="${tomcat.https.host}"
         port="${tomcat.https.port}"
         protocol="org.apache.coyote.http11.Http11NioProtocol"
-        maxThreads="150"
         SSLEnabled="true"
         scheme="https"
         secure="true">
@@ -128,10 +131,11 @@
         </SSLHostConfig>
     </Connector>
 
+    <!-- Define dedicated SOAP connector for back-channel requests
     <Connector
+        address="${tomcat.https.host}"
         port="${tomcat.backchannel.port}"
         protocol="org.apache.coyote.http11.Http11NioProtocol"
-        maxThreads="150"
         maxPostSize="100000"
         SSLEnabled="true"
         scheme="https"
@@ -141,6 +145,7 @@
         keystorePass="${tomcat.backchannel.keystorePass}"
         keystoreType="${tomcat.backchannel.keystoreType}"
         trustManagerClassName="net.shibboleth.utilities.ssl.TrustAnyCertificate" />
+    -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
     <!-- 
diff --git a/src/main/resources/tomcat-base/lib/trustany-ssl-1.0.0.jar b/src/main/resources/tomcat-base/lib-extras/trustany-ssl-1.0.0.jar
similarity index 100%
rename from src/main/resources/tomcat-base/lib/trustany-ssl-1.0.0.jar
rename to src/main/resources/tomcat-base/lib-extras/trustany-ssl-1.0.0.jar

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