From cc5ac274cb129023180dd8d9829d6f69cc9a05d8 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 17 Dec 2020 09:44:40 -0600
Subject: [PATCH] add COmanage SP status pg to main jump pg

---
 .../comanage/shibboleth/shibboleth2.xml           |  2 +-
 .../idp/shibui-metadata-providers.xml             | 15 ++++++++++-----
 .../webproxy/container_files/httpd/index.html     |  7 ++++---
 .../webproxy/container_files/httpd/proxy.conf     |  1 -
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Workbench/configs-and-secrets/comanage/shibboleth/shibboleth2.xml b/Workbench/configs-and-secrets/comanage/shibboleth/shibboleth2.xml
index c5b4e52..2c3fa6b 100644
--- a/Workbench/configs-and-secrets/comanage/shibboleth/shibboleth2.xml
+++ b/Workbench/configs-and-secrets/comanage/shibboleth/shibboleth2.xml
@@ -47,7 +47,7 @@
             <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
 
             <!-- Status reporting service. -->
-            <Handler type="Status" Location="/Status" acl="127.0.0.1 ::1 172.16.0.0/12"/>
+            <Handler type="Status" Location="/Status" acl="127.0.0.1 ::1 172.16.0.0/12 192.168.0.0/16"/>
 
             <!-- Session diagnostic service. -->
             <Handler type="Session" Location="/Session" showAttributeValues="true"/>
diff --git a/Workbench/idp/container_files/idp/shibui-metadata-providers.xml b/Workbench/idp/container_files/idp/shibui-metadata-providers.xml
index 0307448..a5b4eb2 100644
--- a/Workbench/idp/container_files/idp/shibui-metadata-providers.xml
+++ b/Workbench/idp/container_files/idp/shibui-metadata-providers.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata"
-                	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                	id="ShibbolethMetadata"
-                	xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
-                	xsi:type="ChainingMetadataProvider"/>
+<MetadataProvider id="ShibbolethUIMetadataProvider" xsi:type="ChainingMetadataProvider"
+    xmlns="urn:mace:shibboleth:2.0:metadata"
+    xmlns:resource="urn:mace:shibboleth:2.0:resource"
+    xmlns:security="urn:mace:shibboleth:2.0:security"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+                        urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd 
+                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
+                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd" />
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index eb7a75f..3147631 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -8,12 +8,13 @@ <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__/idp/status" target="TAP-WB-IDP">Shibboleth IdP (4.0.1)</a></li>
+<li><a href="https://__CSPHOSTNAME__/idp/status" target="TAP-WB-IDP">Shibboleth IdP (4.0.1) status</a></li>
 <li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.7.0)</a></li>
 <li>Shibboleth SPs:</li>
 <ul>
-  <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-gSP">Grouper SP (3.1.0)</a></li>
-  <li><a href="https://__CSPHOSTNAME__/MPSSO/Shibboleth.sso/Status" target="TAP-WB-mSP">midPoint SP (3.1.0)</a></li>
+  <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-gSP">Grouper SP (3.1.0) status</a></li>
+  <li><a href="https://__CSPHOSTNAME__/MPSSO/Shibboleth.sso/Status" target="TAP-WB-mSP">midPoint SP (3.1.0) status</a></li>
+  <li><a href="https://__CSPHOSTNAME__/registrySSO/Shibboleth.sso/Status" target="TAP-WB-cSP">COmanage SP (3.1.0) status</a></li>
 </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.2)</a></li>
diff --git a/Workbench/webproxy/container_files/httpd/proxy.conf b/Workbench/webproxy/container_files/httpd/proxy.conf
index ff1785a..6c0eafa 100644
--- a/Workbench/webproxy/container_files/httpd/proxy.conf
+++ b/Workbench/webproxy/container_files/httpd/proxy.conf
@@ -59,7 +59,6 @@ ProxyPassReverse /phpmyadmin https://directory/phpmyadmin
 
 ProxyPass /registry https://comanage/registry
 ProxyPass /registrySSO https://comanage/registrySSO
-#ProxyPassReverse /comanage https://comanage/
 
 ProxyPass /wordpress http://wordpress_server/ nocanon
 ProxyPassReverse /wordpress http://wordpress_server/