[cpp-opensaml] 02/02: CPPOST-103 Warn on Deprecated Metadata Filter names

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=959b45596eafdc36a605c8353a88201d3acdc8aa

commit 959b45596eafdc36a605c8353a88201d3acdc8aa
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Mar 29 16:38:17 2018 +0100

    CPPOST-103 Warn on Deprecated Metadata Filter names
    
    	<Include>
    	<Exclude>
    	<WhilelistMetadataFilter>
    	<BlacklistMetadataFilter>
    	<SignatureMetadataFilter>
    
    Remove the deprecated versions from tests files as well.
    
    https://issues.shibboleth.net/jira/browse/CPPOST-103
---
 saml/saml2/metadata/impl/MetadataProvider.cpp              | 5 +++++
 samltest/data/saml2/metadata/XMLMetadataProvider.xml       | 4 ++--
 samltest/data/saml2/metadata/XMLMetadataProviderBadSig.xml | 6 +++---
 samltest/data/saml2/metadata/XMLWithBlacklists.xml         | 6 ++----
 samltest/data/saml2/metadata/XMLWithWhitelists.xml         | 7 ++++---
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp
index 114a5bb..4b3a77a 100644
--- a/saml/saml2/metadata/impl/MetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/MetadataProvider.cpp
@@ -119,22 +119,27 @@ MetadataProvider::MetadataProvider(const DOMElement* e) : m_filterContext(nullpt
                 }
             }
             else if (XMLString::equals(child->getLocalName(), SigFilter)) {
+                log.warn("<SignatureMetadataFilter> and will be deprecated in future versions: use type=\"%s\"", SIGNATURE_METADATA_FILTER);
                 log.info("building MetadataFilter of type %s", SIGNATURE_METADATA_FILTER);
                 m_filters.push_back(conf.MetadataFilterManager.newPlugin(SIGNATURE_METADATA_FILTER, child));
             }
             else if (XMLString::equals(child->getLocalName(), Whitelist)) {
+                log.warn("<WhitelistMetadataFilter> and will be deprecated in future versions use: type=\"%s\"", WHITELIST_METADATA_FILTER);
                 log.info("building MetadataFilter of type %s", WHITELIST_METADATA_FILTER);
                 m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER, child));
             }
             else if (XMLString::equals(child->getLocalName(), Blacklist)) {
+                log.warn("<BlacklistMetadataFilter> and will be deprecated in future versions use: type=\"%s\"", BLACKLIST_METADATA_FILTER);
                 log.info("building MetadataFilter of type %s", BLACKLIST_METADATA_FILTER);
                 m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER, child));
             }
             else if (XMLString::equals(child->getLocalName(), Include)) {
+                log.warn("<Include> and will be deprecated in future versions: use type=\"%s\"", WHITELIST_METADATA_FILTER);
                 log.info("building MetadataFilter of type %s", WHITELIST_METADATA_FILTER);
                 m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER, e));
             }
             else if (XMLString::equals(child->getLocalName(), Exclude)) {
+                log.warn("<Exclude> and will be deprecated in future versions: use type=\"%s\"", BLACKLIST_METADATA_FILTER);
                 log.info("building MetadataFilter of type %s", BLACKLIST_METADATA_FILTER);
                 m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER, e));
             }
diff --git a/samltest/data/saml2/metadata/XMLMetadataProvider.xml b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
index 8da61b9..362b928 100644
--- a/samltest/data/saml2/metadata/XMLMetadataProvider.xml
+++ b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FilesystemMetadataProvider path="../../../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
-    <SignatureMetadataFilter>
+    <MetadataFilter type="Signature">
         <CredentialResolver type="File">
             <Certificate>
                 <Path>../../../samltest/data/incommon.pem</Path>
             </Certificate>
         </CredentialResolver>
-    </SignatureMetadataFilter>
+    </MetadataFilter>
 </FilesystemMetadataProvider>
diff --git a/samltest/data/saml2/metadata/XMLMetadataProviderBadSig.xml b/samltest/data/saml2/metadata/XMLMetadataProviderBadSig.xml
index 7f62c63..1af0aea 100644
--- a/samltest/data/saml2/metadata/XMLMetadataProviderBadSig.xml
+++ b/samltest/data/saml2/metadata/XMLMetadataProviderBadSig.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FilesystemMetadataProvider path="../../../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
-    <SignatureMetadataFilter>
+ <FilesystemMetadataProvider path="../../../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
+     <MetadataFilter type="Signature">
         <CredentialResolver type="File">
             <Certificate>
                 <Path>../../../samltest/data/cert.pem</Path>
             </Certificate>
         </CredentialResolver>
-    </SignatureMetadataFilter>
+    </MetadataFilter>
 </FilesystemMetadataProvider>
diff --git a/samltest/data/saml2/metadata/XMLWithBlacklists.xml b/samltest/data/saml2/metadata/XMLWithBlacklists.xml
index ff2b908..7fc6ff0 100644
--- a/samltest/data/saml2/metadata/XMLWithBlacklists.xml
+++ b/samltest/data/saml2/metadata/XMLWithBlacklists.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
-    <BlacklistMetadataFilter>
+ <FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
+    <MetadataFilter type="Blacklist">
         <Exclude>urn:mace:incommon:washington.edu</Exclude>
         <Exclude>urn:mace:incommon:osu.edu</Exclude>
-    </BlacklistMetadataFilter>
-    <MetadataFilter type="Blacklist">
         <Exclude>urn:mace:incommon:internet2.edu</Exclude>
     </MetadataFilter>
 </FilesystemMetadataProvider>
diff --git a/samltest/data/saml2/metadata/XMLWithWhitelists.xml b/samltest/data/saml2/metadata/XMLWithWhitelists.xml
index f9f3636..6c8aefd 100644
--- a/samltest/data/saml2/metadata/XMLWithWhitelists.xml
+++ b/samltest/data/saml2/metadata/XMLWithWhitelists.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
-    <WhitelistMetadataFilter>
+ <FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
+    <MetadataFilter type="Whitelist">
         <Include>urn:mace:incommon:washington.edu</Include>
         <Include>urn:mace:incommon:osu.edu</Include>
-    </WhitelistMetadataFilter>
+    </MetadataFilter>
 </FilesystemMetadataProvider>
+ 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.