4.3.2

Dockerfile

@@ -8,8 +8,8 @@ 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.1 \
+ENV GROUPER_VERSION=4.3.2 \
+    GROUPER_CONTAINER_VERSION=4.3.2 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF

container_files/tomcat/conf/createPatches.txt

@@ -1,4 +1,2 @@
 # note: get the server.xml into the original, make sure it ends with newline if the file does
-diff -u server.xml.original server.xml.turnOnAjp > server.xml.turnOnAjp.patch     
-diff -u server.xml.turnOnAjp server.xml.loggingpipe > server.xml.loggingpipe.patch
-diff -u server.xml.turnOnAjp server.xml.nologging > server.xml.nologging.patch
+diff -u server.xml.original server.xml.grouper > server.xml.grouper.patch

container_files/tomcat/conf/server.xml.nologging → container_files/tomcat/conf/server.xml.grouper

@@ -120,8 +120,16 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <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" />
-
+    <!--
+    <Connector protocol="AJP/1.3"
+               address="::1"
+               port="8009"
+               redirectPort="8443"
+               maxParameterCount="1000"
+               />
+    -->
+    <!--GROUPER_AJP_CONNECTOR-->
+
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
          analyzes the HTTP headers included with the request, and passes them
@@ -159,13 +167,12 @@
         <!--
         <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
         -->
+        <!--GROUPER_REMOTE_CIDR_VALVE-->
 
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
              Note: The pattern used is equivalent to using pattern="common" -->
-
-
-
+        <!--GROUPER_LOGGING_VALVE-->
 
       </Host>
     </Engine>

container_files/tomcat/conf/server.xml.grouper.patch

@@ -0,0 +1,37 @@
+--- server.xml.original	2023-06-27 13:54:24.000000000 -0400
++++ server.xml.grouper	2023-07-03 02:37:07.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-->
+     <!--
+@@ -128,7 +128,8 @@
+                maxParameterCount="1000"
+                />
+     -->
+-
++    <!--GROUPER_AJP_CONNECTOR-->
++    
+     <!-- An Engine represents the entry point (within Catalina) that processes
+          every request.  The Engine implementation for Tomcat stand alone
+          analyzes the HTTP headers included with the request, and passes them
+@@ -166,13 +167,12 @@
+         <!--
+         <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+         -->
++        <!--GROUPER_REMOTE_CIDR_VALVE-->
+
+         <!-- Access log processes all example.
+              Documentation at: /docs/config/valve.html
+              Note: The pattern used is equivalent to using pattern="common" -->
+-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+-               prefix="localhost_access_log" suffix=".txt"
+-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
++        <!--GROUPER_LOGGING_VALVE-->
+
+       </Host>
+     </Engine>