Merge pull request #127 from internet2/grouper2.5.57

Grouper2.5.57
internet2 · Sep 20, 2021 · 56d14d8 · 56d14d8
2 parents 72d64b0 + 1006f14
commit 56d14d8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/Workbench/configs-and-secrets/grouper/application/grouper.properties b/Workbench/configs-and-secrets/grouper/application/grouper.properties
@@ -23,3 +23,9 @@ groups.wheel.group                    = etc:sysadmingroup
 # Used to allow Include Exclude groups
 grouperIncludeExclude.use = true
 grouperIncludeExclude.requireGroups.use = true
+
+# to allow periods in id paths, changed with grouper 2.5.49
+stem.validateExtensionByDefault = false
+group.validateExtensionByDefault = false
+attributeDef.validateExtensionByDefault = false
+attributeDefName.validateExtensionByDefault = false
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
@@ -87,9 +87,11 @@ services:
      - type: bind
        source: ./configs-and-secrets/grouper/shibboleth/shibboleth2.xml
        target: /etc/shibboleth/shibboleth2.xml
+       # Note: due to a bug in https://github.internet2.edu/docker/grouper/blob/2.5.57/container_files/usr-local-bin/librarySetupFilesForProcess.sh#L72
+       # This file had to be mounted as shib2.conf, instead of shib.conf (bind mounts don't want to be moved)
      - type: bind
        source: ./configs-and-secrets/grouper/httpd/shib.conf
-       target: /etc/httpd/conf.d/shib.conf
+       target: /etc/httpd/conf.d/shib2.conf
      - type: bind
        source: ./configs-and-secrets/grouper/httpd/host-cert.pem
        target: /etc/pki/tls/certs/host-cert.pem

diff --git a/Workbench/grouper_daemon/Dockerfile b/Workbench/grouper_daemon/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/grouper:2.5.37.1
+FROM i2incommon/grouper:2.5.57
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/grouper:2.5.37.1
+FROM i2incommon/grouper:2.5.57
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 

diff --git a/Workbench/grouper_ui/Dockerfile b/Workbench/grouper_ui/Dockerfile
@@ -1,4 +1,5 @@
-FROM i2incommon/grouper:2.5.37.1
+FROM i2incommon/grouper:2.5.57
+
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
 ARG CSPHOSTNAME=localhost

diff --git a/Workbench/grouper_ws/Dockerfile b/Workbench/grouper_ws/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/grouper:2.5.37.1
+FROM i2incommon/grouper:2.5.57
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 

diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
@@ -8,10 +8,12 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <br /><br />
 The system contains the following TAP components (click the links to access each component in its own tab):
 <ul>
-<li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.5.37)</a></li>
-<li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.3.2)</a></li>
-<li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage Registry (3.3.2)</a></li>
+
+ <li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.5.57)</a></li>
+ <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.3.2)</a></li>
+ <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage Registry (3.3.2)</a></li>
 <li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.9.2)</a></li>
+
 </ul>
 <br />
 The system also contains the following downstream/target applications: