-/*
- * Copyright 2001-2010 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
#include "saml2/metadata/MetadataProvider.h"
#include <algorithm>
+#include <boost/lambda/lambda.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xmltooling/logging.h>
#include <xmltooling/unicode.h>
using namespace opensaml;
using namespace xmltooling::logging;
using namespace xmltooling;
+using namespace boost::lambda;
+using namespace boost;
using namespace std;
namespace opensaml {
SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory XMLMetadataProviderFactory;
SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory DynamicMetadataProviderFactory;
SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory ChainingMetadataProviderFactory;
+ SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory FolderMetadataProviderFactory;
SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory NullMetadataProviderFactory;
SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory BlacklistMetadataFilterFactory;
SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory WhitelistMetadataFilterFactory;
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;
};
};
conf.MetadataProviderManager.registerFactory(XML_METADATA_PROVIDER, XMLMetadataProviderFactory);
conf.MetadataProviderManager.registerFactory(DYNAMIC_METADATA_PROVIDER, DynamicMetadataProviderFactory);
conf.MetadataProviderManager.registerFactory(CHAINING_METADATA_PROVIDER, ChainingMetadataProviderFactory);
+ conf.MetadataProviderManager.registerFactory(FOLDER_METADATA_PROVIDER, FolderMetadataProviderFactory);
conf.MetadataProviderManager.registerFactory(NULL_METADATA_PROVIDER, NullMetadataProviderFactory);
}
// 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);
static const XMLCh SigFilter[] = UNICODE_LITERAL_23(S,i,g,n,a,t,u,r,e,M,e,t,a,d,a,t,a,F,i,l,t,e,r);
static const XMLCh Exclude[] = UNICODE_LITERAL_7(E,x,c,l,u,d,e);
static const XMLCh Include[] = UNICODE_LITERAL_7(I,n,c,l,u,d,e);
-static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e);
+static const XMLCh _type[] = UNICODE_LITERAL_4(t,y,p,e);
-MetadataProvider::MetadataProvider(const DOMElement* e)
+MetadataProvider::MetadataProvider(const DOMElement* e) : m_filterContext(nullptr)
{
#ifdef _DEBUG
NDC ndc("MetadataProvider");
#endif
- Category& log = Category::getInstance(SAML_LOGCAT".Metadata");
- SAMLConfig& conf=SAMLConfig::getConfig();
+ Category& log = Category::getInstance(SAML_LOGCAT ".Metadata");
+ SAMLConfig& conf = SAMLConfig::getConfig();
// Locate any default recognized filters and plugins.
try {
- DOMElement* child = e ? XMLHelper::getFirstChildElement(e) : nullptr;
+ DOMElement* child = XMLHelper::getFirstChildElement(e);
while (child) {
- if (XMLString::equals(child->getLocalName(),_MetadataFilter)) {
- auto_ptr_char t(child->getAttributeNS(nullptr,type));
- if (t.get() && *t.get()) {
- log.info("building MetadataFilter of type %s", t.get());
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(t.get(),child));
+ if (XMLString::equals(child->getLocalName(), _MetadataFilter)) {
+ string t = XMLHelper::getAttrString(child, nullptr, _type);
+ if (!t.empty()) {
+ log.info("building MetadataFilter of type %s", t.c_str());
+ auto_ptr<MetadataFilter> np(conf.MetadataFilterManager.newPlugin(t.c_str(), child));
+ m_filters.push_back(np.get());
+ np.release();
+ }
+ else {
+ log.error("MetadataFilter element missing type attribute");
}
}
- else if (XMLString::equals(child->getLocalName(),SigFilter)) {
+ else if (XMLString::equals(child->getLocalName(), SigFilter)) {
log.info("building MetadataFilter of type %s", SIGNATURE_METADATA_FILTER);
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(SIGNATURE_METADATA_FILTER,child));
+ m_filters.push_back(conf.MetadataFilterManager.newPlugin(SIGNATURE_METADATA_FILTER, child));
}
- else if (XMLString::equals(child->getLocalName(),Whitelist)) {
+ else if (XMLString::equals(child->getLocalName(), Whitelist)) {
log.info("building MetadataFilter of type %s", WHITELIST_METADATA_FILTER);
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER,child));
+ m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER, child));
}
- else if (XMLString::equals(child->getLocalName(),Blacklist)) {
+ else if (XMLString::equals(child->getLocalName(), Blacklist)) {
log.info("building MetadataFilter of type %s", BLACKLIST_METADATA_FILTER);
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER,child));
+ m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER, child));
}
- else if (XMLString::equals(child->getLocalName(),Include)) {
+ else if (XMLString::equals(child->getLocalName(), Include)) {
log.info("building MetadataFilter of type %s", WHITELIST_METADATA_FILTER);
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER,e));
+ m_filters.push_back(conf.MetadataFilterManager.newPlugin(WHITELIST_METADATA_FILTER, e));
}
- else if (XMLString::equals(child->getLocalName(),Exclude)) {
+ else if (XMLString::equals(child->getLocalName(), Exclude)) {
log.info("building MetadataFilter of type %s", BLACKLIST_METADATA_FILTER);
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER,e));
+ m_filters.push_back(conf.MetadataFilterManager.newPlugin(BLACKLIST_METADATA_FILTER, e));
}
child = XMLHelper::getNextSiblingElement(child);
}
}
catch (XMLToolingException& ex) {
log.error("caught exception while installing filters: %s", ex.what());
- for_each(m_filters.begin(),m_filters.end(),xmltooling::cleanup<MetadataFilter>());
throw;
}
}
MetadataProvider::~MetadataProvider()
{
- for_each(m_filters.begin(),m_filters.end(),xmltooling::cleanup<MetadataFilter>());
+}
+
+const char* MetadataProvider::getId() const
+{
+ return nullptr;
}
void MetadataProvider::addMetadataFilter(MetadataFilter* newFilter)
MetadataFilter* MetadataProvider::removeMetadataFilter(MetadataFilter* oldFilter)
{
- for (vector<MetadataFilter*>::iterator i=m_filters.begin(); i!=m_filters.end(); i++) {
- if (oldFilter==(*i)) {
- m_filters.erase(i);
- return oldFilter;
- }
+ ptr_vector<MetadataFilter>::iterator i = find_if(m_filters.begin(), m_filters.end(), (&_1 == oldFilter));
+ if (i != m_filters.end()) {
+ return m_filters.release(i).release();
}
return nullptr;
}
+void MetadataProvider::setContext(const MetadataFilterContext* ctx)
+{
+ m_filterContext = ctx;
+}
+
void MetadataProvider::doFilters(XMLObject& xmlObject) const
{
-#ifdef _DEBUG
- NDC ndc("doFilters");
-#endif
- Category& log=Category::getInstance(SAML_LOGCAT".Metadata");
- for (std::vector<MetadataFilter*>::const_iterator i=m_filters.begin(); i!=m_filters.end(); i++) {
- log.info("applying metadata filter (%s)", (*i)->getId());
- (*i)->doFilter(xmlObject);
+ Category& log = Category::getInstance(SAML_LOGCAT ".Metadata");
+ for (ptr_vector<MetadataFilter>::const_iterator i = m_filters.begin(); i != m_filters.end(); i++) {
+ log.info("applying metadata filter (%s)", i->getId());
+ i->doFilter(m_filterContext, xmlObject);
}
}
+void MetadataProvider::outputStatus(ostream& os) const
+{
+}
+
const EntitiesDescriptor* MetadataProvider::getEntitiesDescriptor(const XMLCh* name, bool strict) const
{
auto_ptr_char temp(name);
void MetadataProvider::Criteria::reset()
{
- entityID_unicode=nullptr;
- entityID_ascii=nullptr;
- artifact=nullptr;
- role=nullptr;
- protocol=nullptr;
- protocol2=nullptr;
- validOnly=true;
+ entityID_unicode = nullptr;
+ entityID_ascii = nullptr;
+ artifact = nullptr;
+ role = nullptr;
+ protocol = nullptr;
+ protocol2 = nullptr;
+ validOnly = true;
}
MetadataFilter::MetadataFilter()
MetadataFilter::~MetadataFilter()
{
}
+
+void MetadataFilter::doFilter(const MetadataFilterContext* ctx, xmltooling::XMLObject& xmlObject) const
+{
+ // Default call into deprecated method.
+ doFilter(xmlObject);
+}
+
+void MetadataFilter::doFilter(xmltooling::XMLObject& xmlObject) const
+{
+ // Empty default for deprecated method.
+}
+
+MetadataFilterContext::MetadataFilterContext()
+{
+}
+
+MetadataFilterContext::~MetadataFilterContext()
+{
+}
projects / shibboleth / cpp-opensaml.git / blobdiff