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

…nTAP-Examples into wordpress-shibb
internet2 · Dec 23, 2020 · db88a41 · db88a41
2 parents abed95e + 6b3322e
commit db88a41
Show file tree

Hide file tree

Showing 16 changed files with 236 additions and 84 deletions.
diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile
@@ -1,18 +1,16 @@
 FROM i2incommon/comanage-registry:3.3.1-20201026
 
-ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
-ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
+#ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
+#ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
 ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
 ENV COMANAGE_REGISTRY_DATABASE=registry
 ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
 ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
 ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=123321
-ENV COMANAGE_REGISTRY_EMAIL_FROM=comanange@workbench.incommon.org
+ENV COMANAGE_REGISTRY_EMAIL_FROM=xxxx@example.edu
 ENV COMANAGE_REGISTRY_EMAIL_TRANSPORT=Smtp
 ENV COMANAGE_REGISTRY_EMAIL_PORT=25
-ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.workbench.incommon.org
-ENV COMANAGE_REGISTRY_EMAIL_ACCOUNT=csp
-ENV COMANAGE_REGISTRY_EMAIL_ACCOUNT_PASSWORD=3mail4CSP
+ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.example.edu
 #ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
 #ENV HTTPS_PRIVKEY_FILE=/etc/pki/tls/private/localhost.key
 # COMANAGE_REGISTRY_SECURITY_SALT - autogenerated if not specified

diff --git a/Workbench/comanage_data/container_files/seed-data/comanage-bootstrap.sql b/Workbench/comanage_data/container_files/seed-data/comanage-bootstrap.sql
@@ -3148,12 +3148,3 @@ LOCK TABLES `cm_urls` WRITE;
 /*!40000 ALTER TABLE `cm_urls` DISABLE KEYS */;
 /*!40000 ALTER TABLE `cm_urls` ENABLE KEYS */;
 UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/Workbench/configs-and-secrets/wordpress/httpd/shib.conf b/Workbench/configs-and-secrets/wordpress/httpd/shib.conf
@@ -52,3 +52,8 @@ ShibCompatValidUser Off
   ShibRequestSetting requireSession 1
   require shib-session
 </Location>
+
+<Location />
+  AuthType shibboleth
+  require shibboleth
+</Location>
diff --git a/Workbench/configs-and-secrets/wordpress/shibboleth/shibboleth2.xml b/Workbench/configs-and-secrets/wordpress/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/docker-compose.yml b/Workbench/docker-compose.yml
@@ -372,7 +372,10 @@ services:
      - 443:443
 
   wordpress_server:
-    build: ./wordpress_server/
+    build: 
+      context: ./wordpress_server/
+      args:
+       - CSPHOSTNAME
     networks:
       - net
     depends_on:
@@ -396,17 +399,10 @@ services:
       - type: bind
         source: ./configs-and-secrets/wordpress/httpd/host-cert.pem
         target: /etc/pki/tls/certs/cachain.pem
-      - type: bind
-        source: ./configs-and-secrets/wordpress/shibboleth/sp-cert.pem
-        target: /etc/shibboleth/sp-cert.pem
       - type: bind
         source: ./configs-and-secrets/wordpress/httpd/shib.conf
         target: /etc/httpd/conf.d/shib.conf
 
-    secrets:
-      - source: w_sp-key.pem
-        target: shib_sp-key.pem
-
   wordpress_data:
     build: ./wordpress_data/
     networks:
@@ -508,9 +504,6 @@ secrets:
 # COmanage
   c_sp-key.pem:
     file: ./configs-and-secrets/comanage/shibboleth/sp-key.pem
-# Wordpress
-  w_sp-key.pem:
-    file: ./configs-and-secrets/wordpress/shibboleth/sp-key.pem
 
 volumes:
   grouper_data:

diff --git a/Workbench/idp/shibboleth-idp/conf/attribute-filter.xml b/Workbench/idp/shibboleth-idp/conf/attribute-filter.xml
@@ -19,6 +19,13 @@
         <AttributeRule attributeID="mail" permitAny="true" />
     </AttributeFilterPolicy>
 
+    <AttributeFilterPolicy id="wordpress">
+        <PolicyRequirementRule xsi:type="Requester" value="https://wordpressdemo/shibboleth" />
+        <AttributeRule attributeID="eduPersonPrincipalName" permitAny="true" />
+        <AttributeRule attributeID="uid" permitAny="true" />
+        <AttributeRule attributeID="mail" permitAny="true" />
+    </AttributeFilterPolicy>
+
     <AttributeFilterPolicy id="midpoint">
         <PolicyRequirementRule xsi:type="Requester" value="https://midpointdemo/shibboleth" />
         <AttributeRule attributeID="uid" permitAny="true" />

diff --git a/Workbench/idp/shibboleth-idp/conf/attribute-resolver.xml b/Workbench/idp/shibboleth-idp/conf/attribute-resolver.xml
@@ -28,7 +28,7 @@
         <InputDataConnector ref="myLDAP" attributeNames="cn"/>
     </AttributeDefinition>
     <AttributeDefinition xsi:type="Scoped" id="eduPersonPrincipalName" scope="%{idp.scope}">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
     </AttributeDefinition>
 
     <!-- ========================================== -->

diff --git a/Workbench/idp/shibboleth-idp/metadata/wordpress-sp.xml b/Workbench/idp/shibboleth-idp/metadata/wordpress-sp.xml
@@ -1,7 +1,3 @@
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9d0ae95ee88f2396b39d245b74751e04b8508425" entityID="https://wordpressdemo/shibboleth">
 
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
@@ -29,60 +25,60 @@ and do *NOT* provide it in real time to your partners.
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>1f84026f1f87</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=1f84026f1f87</ds:X509SubjectName>
-          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAKlkm2CJBUzxMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDDFmODQwMjZmMWY4NzAeFw0yMDA0MjExOTAwMzlaFw0zMDA0MTkxOTAwMzla
-MBcxFTATBgNVBAMTDDFmODQwMjZmMWY4NzCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBAPHOVkU6Zu4Q0Mpx1/YpGa+iDG3e8boT5D4ptJldP80cmh13MoA3
-AyeQac86EC8dO1Z8XFmnwsSwT246kBVfLgr6gQgMy7Ql4zLpnFzhKFBPgHBCT/5e
-or9qdn/b/ZPBC2sAeRecS7gFox66/s3+/FJ/XNHErrEDZi3XnDIz6UpOPFWR5WE1
-IUWMnEY27GFX4dAqIaXGBELwvPKsyZYpJLGjovi0beFVlN6B39dDmZn5yUD00ekX
-WSnYPSIYgXo5M1iM7tn5jRoaRo/KGbCK0q4/F3cCbzMSgfwkMAJ5GY0yhPUUXQGQ
-5ieLPawBV5QCiNNF4+SJIdGuASTYiZr7o51bmcMTqjAxTqPRL34cd+Cddndf+sGU
-24zPHfmjB79C0Xn+QgKmvkhujoi+n/pCgEtF1M75IsGY1djipqplOiph9vjQsD2x
-HGe5Vi1RDPqCIMgbxARJh3NodbgLeM92SiJur6VDpOVgdVOich1JYBsL5O3Vlb5v
-xKA6Sol8TneRywIDAQABozowODAXBgNVHREEEDAOggwxZjg0MDI2ZjFmODcwHQYD
-VR0OBBYEFOxhICWI1bbhgXsMW4DNuNHLB4g4MA0GCSqGSIb3DQEBCwUAA4IBgQBU
-0gKlnY0GzzFuYyWoF+tbLPKT9i3InG320A4H9V+VJ3ZgnXy+3kG2rIg09j04mgWF
-YSrWb7BUwYk8WMLD5fbhQ99vpFpKiJnhWvISc3wstgo18k9xr09n4lVU2aYDwgoD
-GTVj59KPu+KlwULvIMnvFbWZm3z2JqGzBMFv8zkID3YCGzyz1Ej7W05A12qcga+o
-Pu5/PLuVY2iRRI2cYpbxG5+kYejNXqiNHph5ROmEEpfnMFHyfMZrpH+BUxVfSTkJ
-K62rduZQabp4qKhIibyXw5fuANIXoGxsSC2IbBKl1jJ23j4aY1OUOqW7YBYkk94Q
-hp77m7JILWdulKtE314/Iy+/5V0k05FsVnWdeRLFW08NK5klt7+x6zG5gTFczN4I
-X+znZJ9LQKrr5VRwEx8aGBbpJ1OVXc5U5ARdtSMz/Nl+yRgZJD3kxID/1sjFRwmq
-OGk1Wid/0g2ZjXSiVMjTi8WrUzw9OyyCi4w9AkBPVNHRvBy1qVjZIlCzcso4gEQ=
+          <ds:X509Certificate>
+MIIEBjCCAm6gAwIBAgIJANwZNSCDkBYjMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzAeFw0yMDEyMjMxMzUzNDZaFw0zMDEy
+MjExMzUzNDZaMCAxHjAcBgNVBAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALoCAG6fcMdxSRSSv1OAEtLTO8Oy
+TiTyPBmHCGynMYjRm8a/pIM8x+bYlh6dPL/HI2IJI2vcIPdFibVbncoX/b0y/9AT
+bw0xx9xmBO9IFCwUDrgOAK20ZWnnAq49Yxz/dmw6K+PqBZpwMqrFfGaqrN8IrPn/
+MgpOzxDBnuD7dWhlxh0WFN1RE93zFghYIDn/DXWsBRm/blFUgDmGip0UJ+Vkh0kq
+a5DLrjtcD1hnR3kKfQ+TbIKEkUBxLLLjKCTbak26u0H5iwHMgL/FuM0U4L+IrwfU
+xTOCCLFRc+uUDe6JguENoanw6cImGZtIFhYOG9UVMeKZl5k7omLV75mr2atus6W6
+Dz0fOOZBl7ffp9xmxruX/gTl0M/nOaXN3axcn3DSPnsEDbpyeYuVRWd46FtT84yf
+QvWMUQ+Ul4pS3abRRnMWNS1F2elPaKEsXxCEPYD7pK1kUqotd2noj9aOec3ZThO5
+aOYBrn53rGBQ16GUBEXc7wd8C8KJtQEY5SO1MQIDAQABo0MwQTAgBgNVHREEGTAX
+ghV3b3JkcHJlc3MuZXhhbXBsZS5vcmcwHQYDVR0OBBYEFDrtqhAIDU//cTGckZaW
+QqpXVtZwMA0GCSqGSIb3DQEBCwUAA4IBgQBoeiXx2YLD5Kth+jib0lcPvX1e3Gpi
+aVpCPb+CDv3GYXRMJU7sy5lPasx1kaIi4DOAqpHKhBZo+j/FZV52Fd0J472tRlDP
+ObGMAHC8mNrTW2T1KCWbnq9ZkZDG8ECRG3VeRs2beEqAepZgFFdNyfabcTFYYq52
+5AlcLuyBEBWL6R43g3o8b08EBErkAYLdD1BiVNVgtujsG9Dyd1+PonerjhHHW1Tn
+7OT+dmgKqoWuP+AEfp4NYLfXUwk1ZE6hWc+LaNkHFQFC6ONuUVXutjQF7hGrtAcr
+mOiaQX2lxP/AETBVt5ENujPy9oZvOnddQjD/1ligbB+2qlV9Ffho6h4DvNzPJrqo
+Jhdg6QahRKeZKLxXsZE6doynKd9Igks0MXEMqQCls0aPrI+IMKnfif5g8N+VFjLD
+Qb5c0stKdTIgo328XoSEVFxtpVP3jPieyUqFwafGN7JMvtfC+YRF846iMKocXhmT
+uNeq2ibSIRl1jKJuXK+P9WL4Bd26gt8HBnc=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>1f84026f1f87</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=1f84026f1f87</ds:X509SubjectName>
-          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAOqc+LvB4m+VMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDDFmODQwMjZmMWY4NzAeFw0yMDA0MjExOTAwNDBaFw0zMDA0MTkxOTAwNDBa
-MBcxFTATBgNVBAMTDDFmODQwMjZmMWY4NzCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBAKcbX9lvwcBpG9qmza970xI4Vj537Aad7Fq7XNJfxRsXbPK+sRYV
-0TwRok2HhCPt2fKrzE03JZtqA7GemihvDDgWiW/KiSU8mFiFeGap0JkxoRnNQOLu
-y7AcZ9NrSh5jts+ko9SrJkVerNI7tF8njlmCR/19R1g/yp/ThLzr6PwfNg9zkFdo
-RXDtzYd1Qq4GPMaHqC8VMKwnaiv2s4KPU/sKN0sEea4XaaziCI6Cf2iZR/rHLNHe
-x9ST0VpuVODz/BOWmxsgTgeYrY3aGAwrB3lXlRkJL6KKabgC5cvrza1MfilzEart
-ngT0ckzCiLoRp10P3pVINqM7unyDdSwgElWvH3AcI3zJDblNyzL0eZp9F/pudNSN
-V4HVyqWPsGhRnDpLW/TS+Fnxv2DQqEe2Srxh61Un+8jZK7IWGeuCgPPuQrwzxq5c
-X98oyNqeys5X3yHkor42RbX4qYQzjfbvjDg4ewcNpNtu9RKfgUXAaMSS6dH5wdrZ
-fwo4Nuv0lCZB/QIDAQABozowODAXBgNVHREEEDAOggwxZjg0MDI2ZjFmODcwHQYD
-VR0OBBYEFCG6Hg40T0gRUyl4IQdW3pcoOIvTMA0GCSqGSIb3DQEBCwUAA4IBgQCM
-wJIMbAtcShEHhPOeZ72rGycR9Z7+yC72uSXyScgHME/kcLVqwzsHXvw37IkfbuvH
-D9Gz34OI4gg5QZtbarp4GpSycnoNJDT5IRNKkFrPyv3QWvyiTBtFguSAr6xOO8Py
-tBWetorrCcpqvnmiEDHIfs6g8vFq1HUDS1etDkrOk/e5RyHW7Yys3CBfRtLoRX/c
-iiEcuQg/HPqlCTFlHFbaSFMjklomSfSYFytdFkqGNNgZobUCAaj3L2Zw3FEBVn0o
-G0CcW9X3s+L+C3CAyofZBY0Nto2AOrAyaRW0wbGkcI3hI744f9rHArUyonTIe0hG
-SS1pwkfzFbpWZmiBMnoA7CB1ma/xVF+ln/gEn1LS7yKIdHO84/etJ3Ve8yjZKSBD
-e1TRefMMT5McNwoKEZdD0OhD8CBk95Pkhcl2limOzy6R7ekBlak2PclSLXyD6Hda
-m1lmTwWWHX/Jt8iVZsV85PlLIbZC0PJaJk90yMtMTBVxyLTU+iNcdhD9qnjwVb8=
+          <ds:X509Certificate>
+MIIEBjCCAm6gAwIBAgIJAMfBuX0EHgUTMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzAeFw0yMDEyMjMxMzU0MDRaFw0zMDEy
+MjExMzU0MDRaMCAxHjAcBgNVBAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALGuaZnmLjQYyfHea1Aaaztp9KZ3
+7E3lQpgbbr65A8F3C3ZWBLbZsXjC/eYkfl/PNTsdhP/hT8pY3X5qw/pT4BB4js9l
+6izWrAULlvdSvHEpy1cFF0LQRLIED4OxjoeKPPvolzzB4KuiJ3s1UAwBqhd2xFCe
+GOn39g50eR+ZIHbHAgweYyBY9Lhs4o1f3b2h/dHpQnorO8r9A+LVTDxTw/a77IYP
+1mkrnElUgxSFljrtR5R/JIcHCPRV4fPL3b71KsU6nzYuDwImnd/VgqiYxgnrvePS
+MR3vEM3Iv1Bz9PjmCwMiKlYzR4IWAH3f3XXUS9zbd7VzQgQfZJ22xnlI8tcmXI0O
+urlQa4+F+XVPLCLLW3MjDGzPRuMNyFzxHuG24JB6AM9qJaVgXR6NtQxWUKP5mrWl
+B6A2Rz31v/ANqYkap3RKRKvXPGrelicIisRUkm4+QWT/BbgmxTPCvKUI+bH/G07c
+YDq43i7fWps0GbLPqPvLNgWjfZAr/NyaPAOhJwIDAQABo0MwQTAgBgNVHREEGTAX
+ghV3b3JkcHJlc3MuZXhhbXBsZS5vcmcwHQYDVR0OBBYEFLX6HBgHrHWIkE9ckQxg
+TfTq9XklMA0GCSqGSIb3DQEBCwUAA4IBgQBugmRLQ2AG3s0r7Eu2cP9CcBpvC8bw
+yhE4qtG6D8v4mKxsTyZUsvW9FBcN5+eyG2vTb+qSkjqY54pobgsbeVWQyc+DLVza
+r/URH/a3FqRAWquRjDrgcI8cwJ833sqxIWPhJvsRVnmDsminLHt5/oso5EpjnLk+
+DSnTVJElAYM0LxGIBQqR+cIJvL5zAJagVqAT9tLHuygJGruGat9fbdRz5eFH99sc
+jwCXbiWx5O6cc5e8ybyq/XrQxHyITT01o8ICIfm4+ycG6sGOxlUXP82OWTZCP6IH
+pVTzLSGJAELtPHLw689YbyFkcXzOYDUTsyCFOeY3+O+rxHyVOVbraa3Zo3vi0Ez3
+L9RaVD3RPOGKyUjOHfbCh/VjQQ4BS6XneIGp9GzNsbXe5gMLhCEH821CCy4qjXCV
+67hWa7nj0Q1K77l87YnDj1qPZ98p/VpGqDK5QDia1+O/CqZybd4Prtwt+vItnr90
+YvpQhMhhTF7S6LTcUwp1WTouwTozS8xDrTY=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -108,3 +104,4 @@ m1lmTwWWHX/Jt8iVZsV85PlLIbZC0PJaJk90yMtMTBVxyLTU+iNcdhD9qnjwVb8=
   </md:SPSSODescriptor>
 
 </md:EntityDescriptor>
+
diff --git a/...erver/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml b/...erver/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml
@@ -13,7 +13,7 @@
     		<tooltip>Person imported from the HR CSV</tooltip>
     		<icon>
     			<cssClass>fa fa-user-circle</cssClass>
-    			<color>olive</color>
+    			<color>purple</color>
     		</icon>
     	</display>
     </archetypePolicy>

diff --git a/.../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml b/.../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
@@ -86,13 +86,19 @@
 				<matchingRule>mr:distinguishedName</matchingRule>
                 <outbound>
                     <strength>strong</strength>
+					<source>
+                        <path>familyName</path>
+                    </source>
                     <source>
-                        <path>name</path>
+                        <path>givenName</path>
                     </source>
                     <expression>
                         <script>
                             <code>
-                                'uid=' + name + ',ou=People,dc=internet2,dc=edu'
+								tmpGivenName = basic.norm(basic.stringify(givenName))?.tr(' ', '.')
+                                tmpFamilyName = basic.norm(basic.stringify(familyName))?.tr(' ', '.')
+							    tmpuid = tmpGivenName.substring(0, 1) + tmpFamilyName + iterationToken
+                                'uid=' + tmpuid + ',ou=People,dc=internet2,dc=edu'
                             </code>
                         </script>
                     </expression>
@@ -147,9 +153,21 @@
 				<matchingRule>mr:stringIgnoreCase</matchingRule>
                 <outbound>
                     <strength>strong</strength>
+					<source>
+                        <path>familyName</path>
+                    </source>
                     <source>
-                        <path>name</path>
+                        <path>givenName</path>
                     </source>
+					<expression>
+                        <script>
+                            <code>
+							  tmpGivenName = basic.norm(basic.stringify(givenName))?.tr(' ', '.')
+                              tmpFamilyName = basic.norm(basic.stringify(familyName))?.tr(' ', '.')
+							  return tmpGivenName.substring(0, 1) + tmpFamilyName + iterationToken
+                            </code>
+                        </script>
+                    </expression>
                 </outbound>
 			</attribute>
 			<attribute>
@@ -220,6 +238,20 @@
                     <outbound/>
                 </password>
             </credentials>
+            <iteration>
+                <maxIterations>10</maxIterations>
+                <tokenExpression>
+                    <script>
+                        <code>
+                            if (iteration == 0) {
+                                return "";
+                            } else {
+                                return sprintf("%02d", iteration);
+                            }
+                        </code>
+                    </script>
+                </tokenExpression>
+            </iteration>
 		</objectType>
 
         <objectType>

diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
@@ -17,7 +17,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 The system also contains the following downstream/target applications:
 <ul>
 <li><a href="https://__CSPHOSTNAME__/wordpress/" target="TAP-WB-WORDPRESS">WordPress</a></li>
-<li><a href="https://__CSPHOSTNAME__/wordpress/wp-admin/" target="TAP-WB-WORDPRESS-ADMON">WordPress Admin</a></li>
+<ul><li><a href="https://__CSPHOSTNAME__/wordpress/wp-admin/" target="TAP-WB-WORDPRESS-ADMON">WordPress Admin</a></li></ul>
 </ul>
 <br />
 The following repository and message exchange monitoring tools are available:
@@ -35,6 +35,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
   <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-gSP">Grouper SP (3.2.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.2.0) status</a></li>
+  <li><a href="https://__CSPHOSTNAME__/wordpressSSO/Shibboleth.sso/Status" target="TAP-WB-wSP">Wordpress SP (3.2.0) status</a></li>
 </ul>
 </ul>
 <br /><br /><br />

diff --git a/Workbench/wordpress_server/Dockerfile b/Workbench/wordpress_server/Dockerfile
@@ -24,7 +24,7 @@ RUN echo 'date.timezone="UTC"' >> /etc/php.ini
 RUN cat /etc/resolv.conf
 WORKDIR /var/www/html
 
-RUN ln -sf /run/secrets/shib_sp-key.pem /etc/shibboleth/sp-key.pem
+#RUN ln -sf /run/secrets/shib_sp-key.pem /etc/shibboleth/sp-key.pem
 RUN chown -R apache:apache /var/www/html
 COPY container_files/system/setservername.sh /usr/local/bin/
 RUN chmod 755 /usr/local/bin/setservername.sh #&& rm -f /etc/httpd/conf.d/ssl.conf

diff --git a/Workbench/wordpress_server/container_files/shibboleth/sp-encrypt-cert.pem b/Workbench/wordpress_server/container_files/shibboleth/sp-encrypt-cert.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBjCCAm6gAwIBAgIJAMfBuX0EHgUTMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzAeFw0yMDEyMjMxMzU0MDRaFw0zMDEy
+MjExMzU0MDRaMCAxHjAcBgNVBAMTFXdvcmRwcmVzcy5leGFtcGxlLm9yZzCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALGuaZnmLjQYyfHea1Aaaztp9KZ3
+7E3lQpgbbr65A8F3C3ZWBLbZsXjC/eYkfl/PNTsdhP/hT8pY3X5qw/pT4BB4js9l
+6izWrAULlvdSvHEpy1cFF0LQRLIED4OxjoeKPPvolzzB4KuiJ3s1UAwBqhd2xFCe
+GOn39g50eR+ZIHbHAgweYyBY9Lhs4o1f3b2h/dHpQnorO8r9A+LVTDxTw/a77IYP
+1mkrnElUgxSFljrtR5R/JIcHCPRV4fPL3b71KsU6nzYuDwImnd/VgqiYxgnrvePS
+MR3vEM3Iv1Bz9PjmCwMiKlYzR4IWAH3f3XXUS9zbd7VzQgQfZJ22xnlI8tcmXI0O
+urlQa4+F+XVPLCLLW3MjDGzPRuMNyFzxHuG24JB6AM9qJaVgXR6NtQxWUKP5mrWl
+B6A2Rz31v/ANqYkap3RKRKvXPGrelicIisRUkm4+QWT/BbgmxTPCvKUI+bH/G07c
+YDq43i7fWps0GbLPqPvLNgWjfZAr/NyaPAOhJwIDAQABo0MwQTAgBgNVHREEGTAX
+ghV3b3JkcHJlc3MuZXhhbXBsZS5vcmcwHQYDVR0OBBYEFLX6HBgHrHWIkE9ckQxg
+TfTq9XklMA0GCSqGSIb3DQEBCwUAA4IBgQBugmRLQ2AG3s0r7Eu2cP9CcBpvC8bw
+yhE4qtG6D8v4mKxsTyZUsvW9FBcN5+eyG2vTb+qSkjqY54pobgsbeVWQyc+DLVza
+r/URH/a3FqRAWquRjDrgcI8cwJ833sqxIWPhJvsRVnmDsminLHt5/oso5EpjnLk+
+DSnTVJElAYM0LxGIBQqR+cIJvL5zAJagVqAT9tLHuygJGruGat9fbdRz5eFH99sc
+jwCXbiWx5O6cc5e8ybyq/XrQxHyITT01o8ICIfm4+ycG6sGOxlUXP82OWTZCP6IH
+pVTzLSGJAELtPHLw689YbyFkcXzOYDUTsyCFOeY3+O+rxHyVOVbraa3Zo3vi0Ez3
+L9RaVD3RPOGKyUjOHfbCh/VjQQ4BS6XneIGp9GzNsbXe5gMLhCEH821CCy4qjXCV
+67hWa7nj0Q1K77l87YnDj1qPZ98p/VpGqDK5QDia1+O/CqZybd4Prtwt+vItnr90
+YvpQhMhhTF7S6LTcUwp1WTouwTozS8xDrTY=
+-----END CERTIFICATE-----