From efcda3db90c0bb2e4a78db9eb20e990bae39c073 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 22 Feb 2012 17:55:00 +0000
Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPOST-73

---
 saml/Makefile.am                              | 1 +
 saml/saml.vcxproj                             | 1 +
 saml/saml.vcxproj.filters                     | 3 +++
 saml/saml2/metadata/MetadataFilter.h          | 3 +++
 saml/saml2/metadata/impl/MetadataProvider.cpp | 3 +++
 5 files changed, 11 insertions(+)

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 1dab792..4c34286 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -146,6 +146,7 @@ libsaml_la_SOURCES = \
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
 	saml2/metadata/impl/DiscoverableMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
+    saml2/metadata/impl/EntityAttributesMetadataFilter.cpp \
 	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
 	saml2/metadata/impl/FolderMetadataProvider.cpp \
 	saml2/metadata/impl/MetadataCredentialContext.cpp \
diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
index 0605a5b..becd37b 100644
--- a/saml/saml.vcxproj
+++ b/saml/saml.vcxproj
@@ -177,6 +177,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
+    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp" />
     <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />
     <ClCompile Include="SAMLConfig.cpp" />
     <ClCompile Include="util\CommonDomainCookie.cpp" />
diff --git a/saml/saml.vcxproj.filters b/saml/saml.vcxproj.filters
index bc1143d..531be08 100644
--- a/saml/saml.vcxproj.filters
+++ b/saml/saml.vcxproj.filters
@@ -366,6 +366,9 @@
     <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
+    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp">
+      <Filter>Source Files\saml2\metadata\impl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Assertion.h">
diff --git a/saml/saml2/metadata/MetadataFilter.h b/saml/saml2/metadata/MetadataFilter.h
index c6b5ff9..ed89cbb 100644
--- a/saml/saml2/metadata/MetadataFilter.h
+++ b/saml/saml2/metadata/MetadataFilter.h
@@ -83,6 +83,9 @@ namespace opensaml {
         /** MetadataFilter that removes non-retained roles. */
         #define ENTITYROLE_METADATA_FILTER  "EntityRoleWhiteList"
 
+        /** MetadataFilter that adds EntityAttributes extension. */
+        #define ENTITYATTR_METADATA_FILTER "EntityAttributes"
+
         DECL_XMLTOOLING_EXCEPTION(MetadataFilterException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,MetadataException,Exceptions related to metadata filtering);
     };
 };
diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp
index f606131..f7b98d0 100644
--- a/saml/saml2/metadata/impl/MetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/MetadataProvider.cpp
@@ -56,6 +56,7 @@ namespace opensaml {
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory SignatureMetadataFilterFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory RequireValidUntilMetadataFilterFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory EntityRoleMetadataFilterFactory;
+        SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory EntityAttributesMetadataFilterFactory;
     };
 };
 
@@ -78,6 +79,8 @@ void SAML_API opensaml::saml2md::registerMetadataFilters()
     // additional name matching Java code
     SAMLConfig::getConfig().MetadataFilterManager.registerFactory("RequiredValidUntil", RequireValidUntilMetadataFilterFactory);
     SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYROLE_METADATA_FILTER, EntityRoleMetadataFilterFactory);
+    SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYATTR_METADATA_FILTER, EntityAttributesMetadataFilterFactory);
+
 }
 
 static const XMLCh _MetadataFilter[] =  UNICODE_LITERAL_14(M,e,t,a,d,a,t,a,F,i,l,t,e,r);
-- 
2.1.4