AbstractHandler::AbstractHandler(
const DOMElement* e, Category& log, DOMNodeFilter* filter, const map<string,string>* remapper
) : m_log(log), m_configNS(shibspconstants::SHIB2SPCONFIG_NS) {
- load(e,log,filter,remapper);
+ load(e,NULL,filter,remapper);
}
#ifndef SHIBSP_LITE
{
try {
// Load the property set.
- load(e,log,this);
+ load(e,NULL,this);
setParent(base);
// Load any AccessControl provider.
#endif
// Load the property set.
- load(e,log,this);
+ load(e,NULL,this);
// Load any AccessControl provider.
loadACL(e,log);
try {
// First load any property sets.
- load(e,log,this);
+ load(e,NULL,this);
if (base)
setParent(base);
child = XMLHelper::getFirstChildElement(e,RelyingParty);
while (child) {
auto_ptr<DOMPropertySet> rp(new DOMPropertySet());
- rp->load(child,log,this);
+ rp->load(child,NULL,this);
rp->setParent(this);
m_partyMap[child->getAttributeNS(NULL,saml2::Attribute::NAME_ATTRIB_NAME)]=rp.release();
child = XMLHelper::getNextSiblingElement(child,RelyingParty);
XMLString::equals(name,_ArtifactMap) ||
XMLString::equals(name,_Extensions) ||
XMLString::equals(name,Listener) ||
- XMLString::equals(name,Policy) ||
XMLString::equals(name,_RequestMapper) ||
XMLString::equals(name,_ReplayCache) ||
+ XMLString::equals(name,SecurityPolicies) ||
XMLString::equals(name,_SessionCache) ||
XMLString::equals(name,Site) ||
XMLString::equals(name,_StorageService) ||
}
// First load any property sets.
- load(e,log,this);
+ load(e,NULL,this);
const DOMElement* child;
string plugtype;
pair< PropertySet*,vector<const SecurityPolicyRule*> >& rules = m_policyMap[id.get()];
rules.first = NULL;
auto_ptr<DOMPropertySet> settings(new DOMPropertySet());
- settings->load(child, log, &filter);
+ settings->load(child, NULL, &filter);
rules.first = settings.release();
// Process Rule elements.
void DOMPropertySet::load(
const DOMElement* e,
- Category& log,
+ Category* log,
DOMNodeFilter* filter,
const std::map<std::string,std::string>* remapper
)
if (!e)
return;
m_root=e;
+ if (!log)
+ log = &Category::getInstance(SHIBSP_LOGCAT".PropertySet");
// Process each attribute as a property.
DOMNamedNodeMap* attrs=m_root->getAttributes();
if (remapper) {
remap=remapper->find(realname);
if (remap!=remapper->end()) {
- log.warn("remapping property (%s) to (%s)",realname,remap->second.c_str());
+ log->warn("remapping property (%s) to (%s)",realname,remap->second.c_str());
realname=remap->second.c_str();
}
}
m_map[string("{") + remap->second.c_str() + '}' + realname]=pair<char*,const XMLCh*>(val,a->getNodeValue());
else
m_map[string("{") + ns.get() + '}' + realname]=pair<char*,const XMLCh*>(val,a->getNodeValue());
- log.debug("added property {%s}%s (%s)",ns.get(),realname,val);
+ log->debug("added property {%s}%s (%s)",ns.get(),realname,val);
}
else {
m_map[realname]=pair<char*,const XMLCh*>(val,a->getNodeValue());
- log.debug("added property %s (%s)",realname,val);
+ log->debug("added property %s (%s)",realname,val);
}
}
}
if (remapper) {
remap=remapper->find(realname);
if (remap!=remapper->end()) {
- log.warn("remapping property set (%s) to (%s)",realname,remap->second.c_str());
+ log->warn("remapping property set (%s) to (%s)",realname,remap->second.c_str());
realname=remap->second.c_str();
}
}
else
key=realname;
if (m_nested.find(key)!=m_nested.end())
- log.warn("load() skipping duplicate property set: %s",key.c_str());
+ log->warn("load() skipping duplicate property set: %s",key.c_str());
else {
DOMPropertySet* set=new DOMPropertySet();
set->load(e,log,filter,remapper);
m_nested[key]=set;
- log.debug("added nested property set: %s",key.c_str());
+ log->debug("added nested property set: %s",key.c_str());
}
e=static_cast<DOMElement*>(walker->nextSibling());
}
* Loads the property set from a DOM element.
*
* @param e root element of property set
- * @param log log object for tracing
+ * @param log optional log object for tracing
* @param filter optional filter controls what child elements to include as nested PropertySets
* @param remapper optional map of property rename rules for legacy property support
*/
void load(
const xercesc::DOMElement* e,
- xmltooling::logging::Category& log,
- xercesc::DOMNodeFilter* filter,
+ xmltooling::logging::Category* log=NULL,
+ xercesc::DOMNodeFilter* filter=NULL,
const std::map<std::string,std::string>* remapper=NULL
);