upgrade idp

Workbench/idp/Dockerfile

@@ -1,4 +1,4 @@
-FROM tier/shib-idp:3.4.6_20191002
+FROM tier/shib-idp:latest
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 

Workbench/idp/shibboleth-idp/conf/attribute-filter.xml

@@ -1,47 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    This file is an EXAMPLE policy file.  While the policy presented in this 
-    example file is illustrative of some simple cases, it relies on the names of
-    non-existent example services and the example attributes demonstrated in the
-    default attribute-resolver.xml file.
-    
-    Deployers should refer to the documentation for a complete list of components
-    and their options.
--->
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
-        xmlns:afp="urn:mace:shibboleth:2.0:afp"
-        xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
-        xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
+<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+        xmlns="urn:mace:shibboleth:2.0:afp"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
-                            urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
-                            urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+        xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
 
     <!-- Release some attributes to an SP. -->
-    <afp:AttributeFilterPolicy id="example1">
-        <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://grouperdemo/shibboleth" />
+    <AttributeFilterPolicy id="grouper">
+        <PolicyRequirementRule xsi:type="Requester" value="https://grouperdemo/shibboleth" />
 
-        <afp:AttributeRule attributeID="eduPersonPrincipalName">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="eduPersonPrincipalName" permitAny="true" />
 
-        <afp:AttributeRule attributeID="uid">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="uid" permitAny="true" />
 
-        <afp:AttributeRule attributeID="mail">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="mail" permitAny="true" />
 
-    </afp:AttributeFilterPolicy>
+    </AttributeFilterPolicy>
 
-    <afp:AttributeFilterPolicy id="midpoint">
-        <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="midpointdemo-shibboleth" />
+    <AttributeFilterPolicy id="midpoint">
+        <PolicyRequirementRule xsi:type="Requester" value="midpointdemo-shibboleth" />
 
-        <afp:AttributeRule attributeID="uid">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="uid" permitAny="true" />
 
-    </afp:AttributeFilterPolicy>
+    </AttributeFilterPolicy>
 
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>

Workbench/idp/shibboleth-idp/messages/messages.properties

@@ -0,0 +1,2 @@
+idp.logo = /images/csp_logo.jpg
+idp.logo.alt-text = InCommon CSP

Workbench/webproxy/Dockerfile

@@ -2,4 +2,5 @@ FROM tier/shibboleth_sp:latest
 
 COPY container_files/httpd/proxy.conf /etc/httpd/conf.d/
 COPY container_files/httpd/index.html /var/www/html/
+COPY container_files/httpd/csp_logo.jpg /var/www/html/
 

Workbench/webproxy/container_files/httpd/index.html

@@ -1,4 +1,5 @@
-<br />
+<img src="csp_logo.jpg">
+<br /><br />
 <h3>Welcome to the InCommon TAP Workbench!</h3>
 <br />
 This is your own personal instance of the InCommon <i>Trusted Access Platform</i> Workbench.