Merge pull request #113 from MiamiOH/111-Update-InCommon-for-MDQ

111 update in common for mdq
MiamiOH · Feb 18, 2025 · 7d25b6b · 7d25b6b
2 parents abe632b + a25a94b
commit 7d25b6b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/templates/shibboleth/credentials/inc-md-cert-mdq.pem b/templates/shibboleth/credentials/inc-md-cert-mdq.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEvjCCAyagAwIBAgIJANpi9/mkU/zoMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNSTESMBAGA1UEBwwJQW5uIEFyYm9yMRYwFAYDVQQK
+DA1JbnRlcm5ldDIuZWR1MREwDwYDVQQLDAhJbkNvbW1vbjEZMBcGA1UEAwwQbWRx
+LmluY29tbW9uLm9yZzAeFw0xODExMTMxNDI5NDNaFw0zODExMTAxNDI5NDNaMHQx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNSTESMBAGA1UEBwwJQW5uIEFyYm9yMRYw
+FAYDVQQKDA1JbnRlcm5ldDIuZWR1MREwDwYDVQQLDAhJbkNvbW1vbjEZMBcGA1UE
+AwwQbWRxLmluY29tbW9uLm9yZzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+ggGBAJ0+fUTzYVSP6ZOutOEhNdp3WPCPOYqnB4sQFz7IeGbFL1o0lZjx5Izm4Yho
+4wNDd0h486iSkHxNf5dDhCqgz7ZRSmbusOl98SYn70PrUQj/Nzs3w47dPg9Tpb/x
+y44PvNLS/rE56hPgCz/fbHoTTiJt5eosysa1ZebQ3LEyW3jGm+LGtLbdIfkynKVQ
+vpp1FVeCamzdeB3ZRICAvqTYQKE1JQDGlWrEsSW0VVEGNjfbzMzr/g4l8JRdMabQ
+Jig8tj3UIXnu7A2CKSMJSy3WZ3HX+85oHEbL+EV4PtpQz765c69tUIdNTJax9jQ2
+1c3wL0K27HE8jSRlrXImD50R3dXQBKH+iiynBWxRPdyMBa1YfK+zZEWPbLHshSTc
+9hkylQv3awmPR/+Plz5AtTpe5yss/Ifyp01wz1jt42R+6jDE+WbUjp5XDBCAjGEE
+0FPaYtxjZLkmNl367bdTN12OIn/ixPNH+Z/S/4skdBB9Gc4lb2fEBywJQY0OYNOd
+WOxmPwIDAQABo1MwUTAdBgNVHQ4EFgQUMHZuwMaYSJM5mlu3Wc4Ts5xq4/swHwYD
+VR0jBBgwFoAUMHZuwMaYSJM5mlu3Wc4Ts5xq4/swDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOCAYEAMr4wfLrSoPTzfpXtvL+2vrKBJNnRfuJpOYTbPKUc
+DOP2QfzRlczi7suYJvd5rLiRonq8rjyPUyM8gvTfbTps+JhJ6S9mS6dTBxOV1qPZ
+3Ab+XKmq8LUtguGRabKgJgmJH0+inR/wVoal7EVHcWXfij9AT8DZOXW88shc6grh
+jUaFZBu/2+q8c8ee0e4ip8B+CVEnCwDKI0d+nTcSmPvAE34CNa33F+QGpXawv5yv
+VvIpSaLAeFQhc/jKcnNHfy+Zi7JmSnKZiMvQCbWANQmDjHg7pGmBW9nyQcm6P2/B
+0AVcEj1YTpAR8Mbh1pUdIhoB+chaNnFEIZsXeRsdbbAFpxodInlJ7WekfuvSQ6sU
+EXpoyBGOeuuTmR1va8k3QeL8Wc4yNu/g5LwjmtvPrh2jBF8xujc4J6VzP8K2BjA4
+xk4LnXgjHOT93dBAJhVYJkykDHwyvHUvsBHoP6lfjrt5P8zunK2mdP/AZKik+Rdt
+1GGlErV2AyWShTOaDLW6NxdP
+-----END CERTIFICATE-----
diff --git a/templates/shibboleth/metadata_providers/_metadata_providers_head.erb b/templates/shibboleth/metadata_providers/_metadata_providers_head.erb
@@ -69,19 +69,9 @@
                    minCacheDuration="PT10M"
                    maxCacheDuration="PT8H" />
 <% end -%>    
-    <MetadataProvider id="ICMD" xsi:type="FileBackedHTTPMetadataProvider"
-                    xmlns="urn:mace:shibboleth:2.0:metadata"
-                    metadataURL="http://md.incommon.org/InCommon/InCommon-metadata.xml"
-                    backingFile="%{idp.home}/metadata/InCommon-metadata.xml"
-                    <%- if @proxy_host -%>
-                    proxyHost="<%= @proxy_host %>"
-                    <%- end -%>
-                    <%- if @proxy_port -%>
-                    proxyPort="<%= @proxy_port %>"
-                    <%- end -%>
+    <MetadataProvider id="incommon" xsi:type="DynamicHTTPMetadataProvider"
                     minRefreshDelay="PT5M"
-                    maxRefreshDelay="PT1H"
-                    refreshDelayFactor="0.75">
+                    maxRefreshDelay="PT1H">
 
       <!--
         To bootstrap the trust fabric of the federation, each relying party
@@ -101,7 +91,7 @@
         Signing Certificate.
       -->
       <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
-              certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
+              certificateFile="%{idp.home}/credentials/inc-md-cert-mdq.pem" />
 
       <!--
         Require a validUntil XML attribute on the EntitiesDescriptor element
@@ -114,4 +104,6 @@
         <RetainedRole>md:SPSSODescriptor</RetainedRole>
       </MetadataFilter>
 
+      <MetadataQueryProtocol>https://mdq.incommon.org/</MetadataQueryProtocol>
+
     </MetadataProvider>