From c4d3bfe057f52ab50fc91985303bd1479e245fa9 Mon Sep 17 00:00:00 2001
From: mchyzer <mchyzer@isc.upenn.edu>
Date: Wed, 28 Jun 2023 15:05:42 -0400
Subject: [PATCH] GRP-4810: tomcat 8.5.90 does not listen on 0.0.0.0 for ajp

---
 Dockerfile                                          |  2 +-
 container_files/tomcat/conf/server.xml.loggingpipe  |  4 ++--
 .../tomcat/conf/server.xml.loggingpipe.patch        |  4 ++--
 container_files/tomcat/conf/server.xml.nologging    |  4 ++--
 .../tomcat/conf/server.xml.nologging.patch          |  4 ++--
 container_files/tomcat/conf/server.xml.turnOnAjp    |  4 ++--
 .../tomcat/conf/server.xml.turnOnAjp.patch          | 13 +++++++++++--
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 17395d4..6001a68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 ARG GROUPER_CONTAINER_VERSION
 
 ENV GROUPER_VERSION=4.3.0 \
-    GROUPER_CONTAINER_VERSION=4.3.0 \
+    GROUPER_CONTAINER_VERSION=4.3.1 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
diff --git a/container_files/tomcat/conf/server.xml.loggingpipe b/container_files/tomcat/conf/server.xml.loggingpipe
index 95fae0f..721a15e 100644
--- a/container_files/tomcat/conf/server.xml.loggingpipe
+++ b/container_files/tomcat/conf/server.xml.loggingpipe
@@ -69,7 +69,7 @@
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443"
-               maxParameterCount="1000"
+               maxParameterCount="10000"
                />
     <!-- A "Connector" using the shared thread pool-->
     <!--
@@ -120,7 +120,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />
+    <Connector address="0.0.0.0" secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="10000" />
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
diff --git a/container_files/tomcat/conf/server.xml.loggingpipe.patch b/container_files/tomcat/conf/server.xml.loggingpipe.patch
index 3e47370..7322471 100644
--- a/container_files/tomcat/conf/server.xml.loggingpipe.patch
+++ b/container_files/tomcat/conf/server.xml.loggingpipe.patch
@@ -1,5 +1,5 @@
---- server.xml.turnOnAjp	2023-06-27 13:54:28.000000000 -0400
-+++ server.xml.loggingpipe	2023-06-27 13:53:45.000000000 -0400
+--- server.xml.turnOnAjp	2023-06-28 15:00:26.000000000 -0400
++++ server.xml.loggingpipe	2023-06-28 15:00:26.000000000 -0400
 @@ -163,9 +163,9 @@
          <!-- Access log processes all example.
               Documentation at: /docs/config/valve.html
diff --git a/container_files/tomcat/conf/server.xml.nologging b/container_files/tomcat/conf/server.xml.nologging
index 3fddc76..f462a22 100644
--- a/container_files/tomcat/conf/server.xml.nologging
+++ b/container_files/tomcat/conf/server.xml.nologging
@@ -69,7 +69,7 @@
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443"
-               maxParameterCount="1000"
+               maxParameterCount="10000"
                />
     <!-- A "Connector" using the shared thread pool-->
     <!--
@@ -120,7 +120,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />
+    <Connector address="0.0.0.0" secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="10000" />
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
diff --git a/container_files/tomcat/conf/server.xml.nologging.patch b/container_files/tomcat/conf/server.xml.nologging.patch
index fba67fd..0239eca 100644
--- a/container_files/tomcat/conf/server.xml.nologging.patch
+++ b/container_files/tomcat/conf/server.xml.nologging.patch
@@ -1,5 +1,5 @@
---- server.xml.turnOnAjp	2023-06-27 13:54:28.000000000 -0400
-+++ server.xml.nologging	2023-06-27 13:54:16.000000000 -0400
+--- server.xml.turnOnAjp	2023-06-28 15:00:26.000000000 -0400
++++ server.xml.nologging	2023-06-28 15:00:26.000000000 -0400
 @@ -163,9 +163,9 @@
          <!-- Access log processes all example.
               Documentation at: /docs/config/valve.html
diff --git a/container_files/tomcat/conf/server.xml.turnOnAjp b/container_files/tomcat/conf/server.xml.turnOnAjp
index 7f7a4fc..b218269 100644
--- a/container_files/tomcat/conf/server.xml.turnOnAjp
+++ b/container_files/tomcat/conf/server.xml.turnOnAjp
@@ -69,7 +69,7 @@
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443"
-               maxParameterCount="1000"
+               maxParameterCount="10000"
                />
     <!-- A "Connector" using the shared thread pool-->
     <!--
@@ -120,7 +120,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />
+    <Connector address="0.0.0.0" secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="10000" />
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
diff --git a/container_files/tomcat/conf/server.xml.turnOnAjp.patch b/container_files/tomcat/conf/server.xml.turnOnAjp.patch
index c4f8fb6..70115aa 100644
--- a/container_files/tomcat/conf/server.xml.turnOnAjp.patch
+++ b/container_files/tomcat/conf/server.xml.turnOnAjp.patch
@@ -1,5 +1,14 @@
 --- server.xml.original	2023-06-27 13:54:24.000000000 -0400
-+++ server.xml.turnOnAjp	2023-06-27 13:54:28.000000000 -0400
++++ server.xml.turnOnAjp	2023-06-28 15:00:26.000000000 -0400
+@@ -69,7 +69,7 @@
+     <Connector port="8080" protocol="HTTP/1.1"
+                connectionTimeout="20000"
+                redirectPort="8443"
+-               maxParameterCount="1000"
++               maxParameterCount="10000"
+                />
+     <!-- A "Connector" using the shared thread pool-->
+     <!--
 @@ -120,14 +120,7 @@
      -->
  
@@ -12,7 +21,7 @@
 -               maxParameterCount="1000"
 -               />
 -    -->
-+    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="1000" />
++    <Connector address="0.0.0.0" secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" maxParameterCount="10000" />
  
      <!-- An Engine represents the entry point (within Catalina) that processes
           every request.  The Engine implementation for Tomcat stand alone