Merge branch 'main' of https://github.internet2.edu/internet2/InCommo…

…nTAP-Examples into CSPWB-19
internet2 · Dec 14, 2020 · 9f9dd73 · 9f9dd73
2 parents 85d5bf0 + 810a5c1
commit 9f9dd73
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 4 deletions.
diff --git a/Workbench/directory/container_files/seed-data/data.ldif b/Workbench/directory/container_files/seed-data/data.ldif
@@ -49,3 +49,19 @@ objectClass: top
 uniqueMember: uid=banderson,ou=People,dc=internet2,dc=edu
 cn: sysadmingroup
 
+dn: ou=Guests,dc=internet2,dc=edu
+objectClass: top
+objectClass: organizationalUnit
+ou: Guests
+
+dn: uid=aguest,ou=Guests,dc=internet2,dc=edu
+objectClass: eduPerson
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Andy Guest
+sn: Aguest
+givenName: Andy
+userPassword: password
+description: A guest user
diff --git a/Workbench/midpoint_server/container_files/shibboleth/shibboleth2.xml b/Workbench/midpoint_server/container_files/shibboleth/shibboleth2.xml
@@ -45,7 +45,7 @@
             <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
 
             <!-- Status reporting service. -->
-            <Handler type="Status" Location="/Status" acl="127.0.0.1 ::1"/>
+            <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/scripts/gethealth.py b/Workbench/scripts/gethealth.py
diff --git a/Workbench/scripts/setupcron.sh b/Workbench/scripts/setupcron.sh
diff --git a/Workbench/scripts/update-health-status.sh b/Workbench/scripts/update-health-status.sh
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
@@ -9,9 +9,14 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 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__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-SP">Shibboleth SP (3.1.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__/Shibboleth.sso/Status" target="TAP-WB-pSP">Proxy SP (3.1.0)</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.1)</a></li>
+<li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.2)</a></li>
 <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage (3.3.1)</a></li>
 </ul>
 <br />
@@ -26,4 +31,8 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <li><a href="https://__CSPHOSTNAME__/ldapadmin" target="TAP-WB-LDAPADMIN">LDAP Admin</a></li>
 <li><a href="https://__CSPHOSTNAME__/phpmyadmin" target="TAP-WB-SQLADMIN">SQL Admin</a></li>
 </ul>
+<br /><br />
+<br /><br />
+<a href="https://__CSPHOSTNAME__/status" target="TAP-WB-STATUS">Status</a>
+
 
diff --git a/Workbench/webproxy/container_files/shibboleth/shibboleth2.xml b/Workbench/webproxy/container_files/shibboleth/shibboleth2.xml
@@ -45,7 +45,7 @@
             <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
 
             <!-- Status reporting service. -->
-            <Handler type="Status" Location="/Status" acl="127.0.0.1 ::1"/>
+            <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="false"/>