From 1f6fd2c2bfadeaf2b7a49377305d063df9a3971d Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Thu, 9 Sep 2021 03:54:50 -0400 Subject: [PATCH 1/7] Wordpress metarole fixes --- .../orgs/700-org-wordpress-admin.xml | 98 ------------------- .../orgs/700-org-wordpress-editor.xml | 98 ------------------- .../resources/100-grouper.xml | 44 +++++++++ .../200-metarole-role-wordpress-admin.xml | 2 +- 4 files changed, 45 insertions(+), 197 deletions(-) delete mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml delete mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml deleted file mode 100644 index 5d9984b..0000000 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - generic_app:wordpress:admins - - app:wordpress:admins - cn=app:wordpress:admins,ou=generic,ou=Groups,dc=internet2,dc=edu - - - - - - 2020-12-31T16:22:32.989Z - - - - 2020-12-31T16:22:33.049Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - 2020-12-31T19:08:17.662Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user - 2020-12-31T16:22:33.048Z - - active - - 2020-12-31T18:40:43.115Z - success - - - - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - 2020-12-31T16:22:32.989Z - - - - 2020-12-31T16:22:33.049Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - - - - - - enabled - - - 0 - - - - - - - - - - - - - - - - - - enabled - 2020-12-31T16:22:32.989Z - - app:wordpress:admins - app:wordpress:admins - - - - - - - - \ No newline at end of file diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml deleted file mode 100644 index 19e245e..0000000 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - generic_app:wordpress:editors - - app:wordpress:editors - cn=app:wordpress:editors,ou=generic,ou=Groups,dc=internet2,dc=edu - - - - - - 2020-12-31T16:22:33.522Z - - - - 2020-12-31T16:22:33.571Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - 2020-12-31T19:49:09.090Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user - 2020-12-31T16:22:33.570Z - - active - - 2020-12-31T18:40:43.183Z - success - - - - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - 2020-12-31T16:22:33.522Z - - - - 2020-12-31T16:22:33.571Z - - - - http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation - - - - - - - - - enabled - - - 0 - - - - - - - - - - - - - - - - - - enabled - 2020-12-31T16:22:33.523Z - - app:wordpress:editors - app:wordpress:editors - - - - - - - - \ No newline at end of file diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml index 92ab570..3871d52 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml @@ -131,6 +131,50 @@ + + strong + + + RoleType + 30082d24-0bea-4f22-b558-d0ee2a399c38 + + + + assignment + + all + + + + + + + + strong + + + RoleType + 9e5a82fc-7969-4fd8-9f74-e0857969cdbb + + + + assignment + + all + + + + + + ri:member diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml index f3a099d..be8be36 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml @@ -55,7 +55,7 @@ $containingObject/name - admin + administrator From 609fe0280a7a622466f3a518e5003504aea2542b Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 14 Sep 2021 15:00:57 +0000 Subject: [PATCH 2/7] IdP UI 1.9.2 --- Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml | 8 ++++---- Workbench/idp_ui/Dockerfile | 2 +- Workbench/webproxy/container_files/httpd/index.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml index 824bd24..5d1bf47 100644 --- a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml +++ b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml @@ -13,15 +13,15 @@ - + - + urn:oasis:names:tc:SAML:2.0:nameid-format:transient urn:oasis:names:tc:SAML:2.0:nameid-format:persistent urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified - + - \ No newline at end of file + diff --git a/Workbench/idp_ui/Dockerfile b/Workbench/idp_ui/Dockerfile index f5452b4..2f449e3 100644 --- a/Workbench/idp_ui/Dockerfile +++ b/Workbench/idp_ui/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/shib-idp-ui:1.9.0 +FROM i2incommon/shib-idp-ui:1.9.2 ARG CSPHOSTNAME=localhost ENV CSPHOSTNAME=$CSPHOSTNAME diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index 5c8ab3b..faf8215 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -11,7 +11,7 @@

Welcome to the InCommon TAP Workbench!

  • Grouper (2.5.37.1)
  • midPoint (4.3.2)
  • COmanage Registry (3.3.2)
    • -
  • Shibboleth IdP UI (1.9.0)
    • +
  • Shibboleth IdP UI (1.9.2)

    • The system also contains the following downstream/target applications: From 932edf7be2da168e05df2bd24428d1af4196122d Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 Sep 2021 12:35:24 -0400 Subject: [PATCH 3/7] Update Dockerfile --- 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..cf60abe 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.37.1 LABEL author="tier-packaging@internet2.edu " From a88a89f34d1cdd4c10de45dec51c292651905ce7 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 Sep 2021 12:35:40 -0400 Subject: [PATCH 4/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..547520e 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.37.1 LABEL author="tier-packaging@internet2.edu " From 329267be404ae105f13211cccebf55cda27b1fa8 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 Sep 2021 12:35:52 -0400 Subject: [PATCH 5/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..34cdcef 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.37.1 LABEL author="tier-packaging@internet2.edu " ARG CSPHOSTNAME=localhost From 2c69376862a700f589283c9d48519cadd227dc4b Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 Sep 2021 12:36:08 -0400 Subject: [PATCH 6/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..71901bf 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.37.1 LABEL author="tier-packaging@internet2.edu " From 72d64b090739c247909559d698335ff522e63ceb Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 15 Sep 2021 12:42:35 -0500 Subject: [PATCH 7/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 fb4d2ad..3ae1c56 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):