From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 29 Jan 2015 01:17:57 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-634
X-Git-Tag: 2.5.4~14
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=05d332f32b5079b2fb040bd6c201f382c06022cf

https://issues.shibboleth.net/jira/browse/SSPCPP-634
---

diff --git a/configs/example-shibboleth2.xml b/configs/example-shibboleth2.xml
index 7a3ab2a..efc378d 100644
--- a/configs/example-shibboleth2.xml
+++ b/configs/example-shibboleth2.xml
@@ -229,7 +229,11 @@
               backingFilePath="federation-metadata.xml" reloadInterval="7200">
             <MetadataFilter type="RequireValidUntil" maxValidityInterval="2419200"/>
             <MetadataFilter type="Signature" certificate="fedsigner.pem"/>
-        </MetadataProvider>
+            <DiscoveryFilter type="Blacklist" matcher="EntityAttributes" trimTags="true" 
+              attributeName="http://macedir.org/entity-category"
+              attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+              attributeValue="http://refeds.org/category/hide-from-discovery" />
+          </MetadataProvider>
         -->
 
         <!-- Example of locally maintained metadata. -->
diff --git a/configs/shibboleth2.xml b/configs/shibboleth2.xml
index 1a4b4b8..a12f5c1 100644
--- a/configs/shibboleth2.xml
+++ b/configs/shibboleth2.xml
@@ -76,6 +76,10 @@
               backingFilePath="federation-metadata.xml" reloadInterval="7200">
             <MetadataFilter type="RequireValidUntil" maxValidityInterval="2419200"/>
             <MetadataFilter type="Signature" certificate="fedsigner.pem"/>
+            <DiscoveryFilter type="Blacklist" matcher="EntityAttributes" trimTags="true" 
+              attributeName="http://macedir.org/entity-category"
+              attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+              attributeValue="http://refeds.org/category/hide-from-discovery" />
         </MetadataProvider>
         -->
 
diff --git a/configs/win-shibboleth2.xml b/configs/win-shibboleth2.xml
index 3bd72d5..000e2d9 100644
--- a/configs/win-shibboleth2.xml
+++ b/configs/win-shibboleth2.xml
@@ -119,6 +119,10 @@
               backingFilePath="federation-metadata.xml" reloadInterval="7200">
             <MetadataFilter type="RequireValidUntil" maxValidityInterval="2419200"/>
             <MetadataFilter type="Signature" certificate="fedsigner.pem"/>
+            <DiscoveryFilter type="Blacklist" matcher="EntityAttributes" trimTags="true" 
+              attributeName="http://macedir.org/entity-category"
+              attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+              attributeValue="http://refeds.org/category/hide-from-discovery" />
         </MetadataProvider>
         -->