From 1e0ab101da2062fae6438dc20448d73cb7806e9f Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 09:24:45 -0400 Subject: [PATCH 1/7] grouper2.5.57 --- Workbench/grouper_daemon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/grouper_daemon/Dockerfile b/Workbench/grouper_daemon/Dockerfile index ea4823a..0602528 100644 --- a/Workbench/grouper_daemon/Dockerfile +++ b/Workbench/grouper_daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.56 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " From 4477fe9d10474379b06a6424458bc33bc440190f Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 09:25:12 -0400 Subject: [PATCH 2/7] Update Dockerfile --- Workbench/grouper_data/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile index a5cfe99..a24d3dc 100644 --- a/Workbench/grouper_data/Dockerfile +++ b/Workbench/grouper_data/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.56 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " From 80fbfc009db038c31a540ca767f15e19a68be18a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 09:28:03 -0400 Subject: [PATCH 3/7] Update Dockerfile --- Workbench/grouper_ui/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/grouper_ui/Dockerfile b/Workbench/grouper_ui/Dockerfile index e92e47f..1ec8034 100644 --- a/Workbench/grouper_ui/Dockerfile +++ b/Workbench/grouper_ui/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.56 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " ARG CSPHOSTNAME=localhost From e527b0dd272b3f62334a4134cd727f9a41969bc3 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 09:28:17 -0400 Subject: [PATCH 4/7] Update Dockerfile --- Workbench/grouper_ws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/grouper_ws/Dockerfile b/Workbench/grouper_ws/Dockerfile index f5dd564..fa7137b 100644 --- a/Workbench/grouper_ws/Dockerfile +++ b/Workbench/grouper_ws/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.56 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " From 20b26dbf17ace7bfa2501862b5160756dc7a2103 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 13:51:29 -0400 Subject: [PATCH 5/7] Update docker-compose.yml --- Workbench/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index 75f0300..13b8a9a 100644 --- 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 From a9a69afcc52439acf9903d3475f0b924ea910eb6 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 14:20:26 -0400 Subject: [PATCH 6/7] Update index.html --- Workbench/webproxy/container_files/httpd/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index b1d717a..d14d4f3 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -8,7 +8,7 @@

Welcome to the InCommon TAP Workbench!



The system contains the following TAP components (click the links to access each component in its own tab):
    -
  • Grouper (2.5.56)
    • +
  • Grouper (2.5.57)
  • midPoint (4.3.2)
  • COmanage Registry (3.3.2)
  • Shibboleth IdP UI (1.9.0)
    • From 3410a6d6ab7db3a54c95478d4aea81e0ac592ede Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 20 Sep 2021 14:51:14 -0400 Subject: [PATCH 7/7] Update grouper.properties --- .../grouper/application/grouper.properties | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Workbench/configs-and-secrets/grouper/application/grouper.properties b/Workbench/configs-and-secrets/grouper/application/grouper.properties index c931287..086d9a6 100644 --- 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