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;
};
};
// 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 Include[] = UNICODE_LITERAL_7(I,n,c,l,u,d,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");
+ Category& log = Category::getInstance(SAML_LOGCAT ".Metadata");
SAMLConfig& conf = SAMLConfig::getConfig();
// Locate any default recognized filters and plugins.
string t = XMLHelper::getAttrString(child, nullptr, _type);
if (!t.empty()) {
log.info("building MetadataFilter of type %s", t.c_str());
- m_filters.push_back(conf.MetadataFilterManager.newPlugin(t.c_str(), child));
+ 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)) {
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");
+ 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(xmlObject);
+ i->doFilter(m_filterContext, xmlObject);
}
}
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()
+{
+}