https://bugs.internet2.edu/jira/browse/SSPCPP-210
[shibboleth/sp.git] / shibsp / impl / XMLServiceProvider.cpp
index 54dbde6..bff5b55 100644 (file)
-/*\r
- *  Copyright 2001-2007 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * XMLServiceProvider.cpp\r
- *\r
- * XML-based SP configuration and mgmt\r
- */\r
-\r
-#include "internal.h"\r
-#include "exceptions.h"\r
-#include "AccessControl.h"\r
-#include "Application.h"\r
-#include "Handler.h"\r
-#include "RequestMapper.h"\r
-#include "ServiceProvider.h"\r
-#include "SessionCache.h"\r
-#include "SPConfig.h"\r
-#include "SPRequest.h"\r
-#include "TransactionLog.h"\r
-#include "attribute/Attribute.h"\r
-#include "remoting/ListenerService.h"\r
-#include "security/PKIXTrustEngine.h"\r
-#include "util/DOMPropertySet.h"\r
-#include "util/SPConstants.h"\r
-\r
-#include <sys/types.h>\r
-#include <sys/stat.h>\r
-#include <log4cpp/Category.hh>\r
-#include <log4cpp/PropertyConfigurator.hh>\r
-#include <saml/SAMLConfig.h>\r
-#include <saml/saml1/core/Assertions.h>\r
-#include <saml/saml2/metadata/ChainingMetadataProvider.h>\r
-#include <xmltooling/XMLToolingConfig.h>\r
-#include <xmltooling/security/ChainingTrustEngine.h>\r
-#include <xmltooling/util/NDC.h>\r
-#include <xmltooling/util/ReloadableXMLFile.h>\r
-#include <xmltooling/util/ReplayCache.h>\r
-\r
-using namespace shibsp;\r
-using namespace opensaml::saml2;\r
-using namespace opensaml::saml2md;\r
-using namespace opensaml;\r
-using namespace xmltooling;\r
-using namespace log4cpp;\r
-using namespace std;\r
-using xmlsignature::CredentialResolver;\r
-\r
-namespace {\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( push )\r
-    #pragma warning( disable : 4250 )\r
-#endif\r
-\r
-    static vector<const Handler*> g_noHandlers;\r
-\r
-    // Application configuration wrapper\r
-    class SHIBSP_DLLLOCAL XMLApplication : public virtual Application, public DOMPropertySet, public DOMNodeFilter\r
-    {\r
-    public:\r
-        XMLApplication(const ServiceProvider*, const DOMElement* e, const XMLApplication* base=NULL);\r
-        ~XMLApplication() { cleanup(); }\r
-    \r
-        // PropertySet\r
-        pair<bool,bool> getBool(const char* name, const char* ns=NULL) const;\r
-        pair<bool,const char*> getString(const char* name, const char* ns=NULL) const;\r
-        pair<bool,const XMLCh*> getXMLString(const char* name, const char* ns=NULL) const;\r
-        pair<bool,unsigned int> getUnsignedInt(const char* name, const char* ns=NULL) const;\r
-        pair<bool,int> getInt(const char* name, const char* ns=NULL) const;\r
-        const PropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:target:config:1.0") const;\r
-\r
-        // Application\r
-        const char* getId() const {return getString("id").second;}\r
-        const char* getHash() const {return m_hash.c_str();}\r
-        MetadataProvider* getMetadataProvider() const;\r
-        TrustEngine* getTrustEngine() const;\r
-        const vector<const XMLCh*>& getAudiences() const;\r
-        const PropertySet* getCredentialUse(const EntityDescriptor* provider) const;\r
-\r
-        const Handler* getDefaultSessionInitiator() const;\r
-        const Handler* getSessionInitiatorById(const char* id) const;\r
-        const Handler* getDefaultAssertionConsumerService() const;\r
-        const Handler* getAssertionConsumerServiceByIndex(unsigned short index) const;\r
-        const vector<const Handler*>& getAssertionConsumerServicesByBinding(const XMLCh* binding) const;\r
-        const Handler* getHandler(const char* path) const;\r
-        \r
-        // Provides filter to exclude special config elements.\r
-        short acceptNode(const DOMNode* node) const;\r
-    \r
-    private:\r
-        void cleanup();\r
-        const ServiceProvider* m_sp;   // this is ok because its locking scope includes us\r
-        const XMLApplication* m_base;\r
-        string m_hash;\r
-        MetadataProvider* m_metadata;\r
-        TrustEngine* m_trust;\r
-        vector<const XMLCh*> m_audiences;\r
-\r
-        // manage handler objects\r
-        vector<Handler*> m_handlers;\r
-\r
-        // maps location (path info) to applicable handlers\r
-        map<string,const Handler*> m_handlerMap;\r
-\r
-        // maps unique indexes to consumer services\r
-        map<unsigned int,const Handler*> m_acsIndexMap;\r
-        \r
-        // pointer to default consumer service\r
-        const Handler* m_acsDefault;\r
-\r
-        // maps binding strings to supporting consumer service(s)\r
-#ifdef HAVE_GOOD_STL\r
-        typedef map<xstring,vector<const Handler*> > ACSBindingMap;\r
-#else\r
-        typedef map<string,vector<const Handler*> > ACSBindingMap;\r
-#endif\r
-        ACSBindingMap m_acsBindingMap;\r
-\r
-        // maps unique ID strings to session initiators\r
-        map<string,const Handler*> m_sessionInitMap;\r
-\r
-        // pointer to default session initiator\r
-        const Handler* m_sessionInitDefault;\r
-\r
-        DOMPropertySet* m_credDefault;\r
-#ifdef HAVE_GOOD_STL\r
-        map<xstring,PropertySet*> m_credMap;\r
-#else\r
-        map<const XMLCh*,PropertySet*> m_credMap;\r
-#endif\r
-    };\r
-\r
-    // Top-level configuration implementation\r
-    class SHIBSP_DLLLOCAL XMLConfig;\r
-    class SHIBSP_DLLLOCAL XMLConfigImpl : public DOMPropertySet, public DOMNodeFilter\r
-    {\r
-    public:\r
-        XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* outer);\r
-        ~XMLConfigImpl();\r
-        \r
-        RequestMapper* m_requestMapper;\r
-        map<string,Application*> m_appmap;\r
-        map<string,CredentialResolver*> m_credResolverMap;\r
-        map< string,pair< PropertySet*,vector<const SecurityPolicyRule*> > > m_policyMap;\r
-        \r
-        // Provides filter to exclude special config elements.\r
-        short acceptNode(const DOMNode* node) const;\r
-\r
-        void setDocument(DOMDocument* doc) {\r
-            m_document = doc;\r
-        }\r
-\r
-    private:\r
-        void doExtensions(const DOMElement* e, const char* label, Category& log);\r
-\r
-        const XMLConfig* m_outer;\r
-        DOMDocument* m_document;\r
-    };\r
-\r
-    class SHIBSP_DLLLOCAL XMLConfig : public ServiceProvider, public ReloadableXMLFile\r
-    {\r
-    public:\r
-        XMLConfig(const DOMElement* e)\r
-            : ReloadableXMLFile(e), m_impl(NULL), m_listener(NULL), m_sessionCache(NULL), m_tranLog(NULL) {\r
-        }\r
-        \r
-        void init() {\r
-            load();\r
-        }\r
-\r
-        ~XMLConfig() {\r
-            delete m_impl;\r
-            delete m_sessionCache;\r
-            delete m_listener;\r
-            delete m_tranLog;\r
-            XMLToolingConfig::getConfig().setReplayCache(NULL);\r
-            for_each(m_storage.begin(), m_storage.end(), cleanup_pair<string,StorageService>());\r
-        }\r
-\r
-        // PropertySet\r
-        pair<bool,bool> getBool(const char* name, const char* ns=NULL) const {return m_impl->getBool(name,ns);}\r
-        pair<bool,const char*> getString(const char* name, const char* ns=NULL) const {return m_impl->getString(name,ns);}\r
-        pair<bool,const XMLCh*> getXMLString(const char* name, const char* ns=NULL) const {return m_impl->getXMLString(name,ns);}\r
-        pair<bool,unsigned int> getUnsignedInt(const char* name, const char* ns=NULL) const {return m_impl->getUnsignedInt(name,ns);}\r
-        pair<bool,int> getInt(const char* name, const char* ns=NULL) const {return m_impl->getInt(name,ns);}\r
-        const PropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:sp:config:2.0") const {return m_impl->getPropertySet(name,ns);}\r
-        const DOMElement* getElement() const {return m_impl->getElement();}\r
-\r
-        // ServiceProvider\r
-        TransactionLog* getTransactionLog() const {\r
-            if (m_tranLog)\r
-                return m_tranLog;\r
-            throw ConfigurationException("No TransactionLog available.");\r
-        }\r
-\r
-        StorageService* getStorageService(const char* id) const {\r
-            if (id) {\r
-                map<string,StorageService*>::const_iterator i=m_storage.find(id);\r
-                if (i!=m_storage.end())\r
-                    return i->second;\r
-            }\r
-            return NULL;\r
-        }\r
-\r
-        ListenerService* getListenerService(bool required=true) const {\r
-            if (required && !m_listener)\r
-                throw ConfigurationException("No ListenerService available.");\r
-            return m_listener;\r
-        }\r
-\r
-        SessionCache* getSessionCache(bool required=true) const {\r
-            if (required && !m_sessionCache)\r
-                throw ConfigurationException("No SessionCache available.");\r
-            return m_sessionCache;\r
-        }\r
-\r
-        RequestMapper* getRequestMapper(bool required=true) const {\r
-            if (required && !m_impl->m_requestMapper)\r
-                throw ConfigurationException("No RequestMapper available.");\r
-            return m_impl->m_requestMapper;\r
-        }\r
-\r
-        const Application* getApplication(const char* applicationId) const {\r
-            map<string,Application*>::const_iterator i=m_impl->m_appmap.find(applicationId);\r
-            return (i!=m_impl->m_appmap.end()) ? i->second : NULL;\r
-        }\r
-\r
-        CredentialResolver* getCredentialResolver(const char* id) const {\r
-            if (id) {\r
-                map<string,CredentialResolver*>::const_iterator i=m_impl->m_credResolverMap.find(id);\r
-                if (i!=m_impl->m_credResolverMap.end())\r
-                    return i->second;\r
-            }\r
-            return NULL;\r
-        }\r
-\r
-        const PropertySet* getPolicySettings(const char* id) const {\r
-            map<string,pair<PropertySet*,vector<const SecurityPolicyRule*> > >::const_iterator i = m_impl->m_policyMap.find(id);\r
-            if (i!=m_impl->m_policyMap.end())\r
-                return i->second.first;\r
-            throw ConfigurationException("Security Policy ($1) not found, check <SecurityPolicies> element.", params(1,id));\r
-        }\r
-\r
-        const vector<const SecurityPolicyRule*>& getPolicyRules(const char* id) const {\r
-            map<string,pair<PropertySet*,vector<const SecurityPolicyRule*> > >::const_iterator i = m_impl->m_policyMap.find(id);\r
-            if (i!=m_impl->m_policyMap.end())\r
-                return i->second.second;\r
-            throw ConfigurationException("Security Policy ($1) not found, check <SecurityPolicies> element.", params(1,id));\r
-        }\r
-\r
-    protected:\r
-        pair<bool,DOMElement*> load();\r
-\r
-    private:\r
-        friend class XMLConfigImpl;\r
-        XMLConfigImpl* m_impl;\r
-        mutable ListenerService* m_listener;\r
-        mutable SessionCache* m_sessionCache;\r
-        mutable TransactionLog* m_tranLog;\r
-        mutable map<string,StorageService*> m_storage;\r
-    };\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( pop )\r
-#endif\r
-\r
-    static const XMLCh _Application[] =         UNICODE_LITERAL_11(A,p,p,l,i,c,a,t,i,o,n);\r
-    static const XMLCh Applications[] =         UNICODE_LITERAL_12(A,p,p,l,i,c,a,t,i,o,n,s);\r
-    static const XMLCh Credentials[] =          UNICODE_LITERAL_11(C,r,e,d,e,n,t,i,a,l,s);\r
-    static const XMLCh CredentialUse[] =        UNICODE_LITERAL_13(C,r,e,d,e,n,t,i,a,l,U,s,e);\r
-    static const XMLCh fatal[] =                UNICODE_LITERAL_5(f,a,t,a,l);\r
-    static const XMLCh _Handler[] =             UNICODE_LITERAL_7(H,a,n,d,l,e,r);\r
-    static const XMLCh _id[] =                  UNICODE_LITERAL_2(i,d);\r
-    static const XMLCh Implementation[] =       UNICODE_LITERAL_14(I,m,p,l,e,m,e,n,t,a,t,i,o,n);\r
-    static const XMLCh InProcess[] =            UNICODE_LITERAL_9(I,n,P,r,o,c,e,s,s);\r
-    static const XMLCh Library[] =              UNICODE_LITERAL_7(L,i,b,r,a,r,y);\r
-    static const XMLCh Listener[] =             UNICODE_LITERAL_8(L,i,s,t,e,n,e,r);\r
-    static const XMLCh logger[] =               UNICODE_LITERAL_6(l,o,g,g,e,r);\r
-    static const XMLCh MemoryListener[] =       UNICODE_LITERAL_14(M,e,m,o,r,y,L,i,s,t,e,n,e,r);\r
-    static const XMLCh Policy[] =               UNICODE_LITERAL_6(P,o,l,i,c,y);\r
-    static const XMLCh RelyingParty[] =         UNICODE_LITERAL_12(R,e,l,y,i,n,g,P,a,r,t,y);\r
-    static const XMLCh _ReplayCache[] =         UNICODE_LITERAL_11(R,e,p,l,a,y,C,a,c,h,e);\r
-    static const XMLCh _RequestMapper[] =       UNICODE_LITERAL_13(R,e,q,u,e,s,t,M,a,p,p,e,r);\r
-    static const XMLCh Rule[] =                 UNICODE_LITERAL_4(R,u,l,e);\r
-    static const XMLCh SecurityPolicies[] =     UNICODE_LITERAL_16(S,e,c,u,r,i,t,y,P,o,l,i,c,i,e,s);\r
-    static const XMLCh _SessionCache[] =        UNICODE_LITERAL_12(S,e,s,s,i,o,n,C,a,c,h,e);\r
-    static const XMLCh SessionInitiator[] =     UNICODE_LITERAL_16(S,e,s,s,i,o,n,I,n,i,t,i,a,t,o,r);\r
-    static const XMLCh _StorageService[] =      UNICODE_LITERAL_14(S,t,o,r,a,g,e,S,e,r,v,i,c,e);\r
-    static const XMLCh OutOfProcess[] =         UNICODE_LITERAL_12(O,u,t,O,f,P,r,o,c,e,s,s);\r
-    static const XMLCh TCPListener[] =          UNICODE_LITERAL_11(T,C,P,L,i,s,t,e,n,e,r);\r
-    static const XMLCh _TrustEngine[] =         UNICODE_LITERAL_11(T,r,u,s,t,E,n,g,i,n,e);\r
-    static const XMLCh UnixListener[] =         UNICODE_LITERAL_12(U,n,i,x,L,i,s,t,e,n,e,r);\r
-    static const XMLCh _MetadataProvider[] =    UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r);\r
-    static const XMLCh _path[] =                UNICODE_LITERAL_4(p,a,t,h);\r
-    static const XMLCh _type[] =                UNICODE_LITERAL_4(t,y,p,e);\r
-\r
-    class SHIBSP_DLLLOCAL PolicyNodeFilter : public DOMNodeFilter\r
-    {\r
-    public:\r
-        short acceptNode(const DOMNode* node) const {\r
-            if (XMLHelper::isNodeNamed(node,shibspconstants::SHIB2SPCONFIG_NS,Rule))\r
-                return FILTER_REJECT;\r
-            return FILTER_ACCEPT;\r
-        }\r
-    };\r
-};\r
-\r
-namespace shibsp {\r
-    ServiceProvider* XMLServiceProviderFactory(const DOMElement* const & e)\r
-    {\r
-        return new XMLConfig(e);\r
-    }\r
-};\r
-\r
-XMLApplication::XMLApplication(\r
-    const ServiceProvider* sp,\r
-    const DOMElement* e,\r
-    const XMLApplication* base\r
-    ) : m_sp(sp), m_base(base), m_metadata(NULL), m_trust(NULL),\r
-        m_credDefault(NULL), m_sessionInitDefault(NULL), m_acsDefault(NULL)\r
-{\r
-#ifdef _DEBUG\r
-    xmltooling::NDC ndc("XMLApplication");\r
-#endif\r
-    Category& log=Category::getInstance(SHIBSP_LOGCAT".Application");\r
-\r
-    try {\r
-        // First load any property sets.\r
-        load(e,log,this);\r
-\r
-        SPConfig& conf=SPConfig::getConfig();\r
-        SAMLConfig& samlConf=SAMLConfig::getConfig();\r
-        XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();\r
-\r
-        m_hash=getId();\r
-        m_hash+=getString("providerId").second;\r
-        m_hash=samlConf.hashSHA1(m_hash.c_str(), true);\r
-\r
-        const PropertySet* sessions = getPropertySet("Sessions");\r
-\r
-        // Process handlers.\r
-        Handler* handler=NULL;\r
-        bool hardACS=false, hardSessionInit=false;\r
-        const DOMElement* child = sessions ? XMLHelper::getFirstChildElement(sessions->getElement()) : NULL;\r
-        while (child) {\r
-            try {\r
-                // A handler is based on the Binding property in conjunction with the element name.\r
-                // If it's an ACS or SI, also handle index/id mappings and defaulting.\r
-                if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,AssertionConsumerService::LOCAL_NAME)) {\r
-                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
-                    if (!bindprop.get() || !*(bindprop.get())) {\r
-                        log.warn("md:AssertionConsumerService element has no Binding attribute, skipping it...");\r
-                        child = XMLHelper::getNextSiblingElement(child);\r
-                        continue;\r
-                    }\r
-                    handler=conf.AssertionConsumerServiceManager.newPlugin(bindprop.get(),child);\r
-                    // Map by binding (may be > 1 per binding, e.g. SAML 1.0 vs 1.1)\r
-#ifdef HAVE_GOOD_STL\r
-                    m_acsBindingMap[handler->getXMLString("Binding").second].push_back(handler);\r
-#else\r
-                    m_acsBindingMap[handler->getString("Binding").second].push_back(handler);\r
-#endif\r
-                    m_acsIndexMap[handler->getUnsignedInt("index").second]=handler;\r
-                    \r
-                    if (!hardACS) {\r
-                        pair<bool,bool> defprop=handler->getBool("isDefault");\r
-                        if (defprop.first) {\r
-                            if (defprop.second) {\r
-                                hardACS=true;\r
-                                m_acsDefault=handler;\r
-                            }\r
-                        }\r
-                        else if (!m_acsDefault)\r
-                            m_acsDefault=handler;\r
-                    }\r
-                }\r
-                else if (XMLString::equals(child->getLocalName(),SessionInitiator)) {\r
-                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
-                    if (!bindprop.get() || !*(bindprop.get())) {\r
-                        log.warn("SessionInitiator element has no Binding attribute, skipping it...");\r
-                        child = XMLHelper::getNextSiblingElement(child);\r
-                        continue;\r
-                    }\r
-                    handler=conf.SessionInitiatorManager.newPlugin(bindprop.get(),child);\r
-                    pair<bool,const char*> si_id=handler->getString("id");\r
-                    if (si_id.first && si_id.second)\r
-                        m_sessionInitMap[si_id.second]=handler;\r
-                    if (!hardSessionInit) {\r
-                        pair<bool,bool> defprop=handler->getBool("isDefault");\r
-                        if (defprop.first) {\r
-                            if (defprop.second) {\r
-                                hardSessionInit=true;\r
-                                m_sessionInitDefault=handler;\r
-                            }\r
-                        }\r
-                        else if (!m_sessionInitDefault)\r
-                            m_sessionInitDefault=handler;\r
-                    }\r
-                }\r
-                else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,SingleLogoutService::LOCAL_NAME)) {\r
-                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
-                    if (!bindprop.get() || !*(bindprop.get())) {\r
-                        log.warn("md:SingleLogoutService element has no Binding attribute, skipping it...");\r
-                        child = XMLHelper::getNextSiblingElement(child);\r
-                        continue;\r
-                    }\r
-                    handler=conf.SingleLogoutServiceManager.newPlugin(bindprop.get(),child);\r
-                }\r
-                else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,ManageNameIDService::LOCAL_NAME)) {\r
-                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
-                    if (!bindprop.get() || !*(bindprop.get())) {\r
-                        log.warn("md:ManageNameIDService element has no Binding attribute, skipping it...");\r
-                        child = XMLHelper::getNextSiblingElement(child);\r
-                        continue;\r
-                    }\r
-                    handler=conf.ManageNameIDServiceManager.newPlugin(bindprop.get(),child);\r
-                }\r
-                else {\r
-                    auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                    if (!type.get() || !*(type.get())) {\r
-                        log.warn("Handler element has no type attribute, skipping it...");\r
-                        child = XMLHelper::getNextSiblingElement(child);\r
-                        continue;\r
-                    }\r
-                    handler=conf.HandlerManager.newPlugin(type.get(),child);\r
-                }\r
-\r
-                // Save off the objects after giving the property set to the handler for its use.\r
-                m_handlers.push_back(handler);\r
-\r
-                // Insert into location map.\r
-                pair<bool,const char*> location=handler->getString("Location");\r
-                if (location.first && *location.second == '/')\r
-                    m_handlerMap[location.second]=handler;\r
-                else if (location.first)\r
-                    m_handlerMap[string("/") + location.second]=handler;\r
-\r
-            }\r
-            catch (exception& ex) {\r
-                log.error("caught exception processing handler element: %s", ex.what());\r
-            }\r
-            \r
-            child = XMLHelper::getNextSiblingElement(child);\r
-        }\r
-\r
-        DOMNodeList* nlist=e->getElementsByTagNameNS(samlconstants::SAML20_NS,Audience::LOCAL_NAME);\r
-        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++)\r
-            if (nlist->item(i)->getParentNode()->isSameNode(e) && nlist->item(i)->hasChildNodes())\r
-                m_audiences.push_back(nlist->item(i)->getFirstChild()->getNodeValue());\r
-\r
-        // Always include our own providerId as an audience.\r
-        m_audiences.push_back(getXMLString("providerId").second);\r
-\r
-        if (conf.isEnabled(SPConfig::AttributeResolver)) {\r
-            // TODO\r
-        }\r
-\r
-        if (conf.isEnabled(SPConfig::Metadata)) {\r
-            child = XMLHelper::getFirstChildElement(e,_MetadataProvider);\r
-            if (child) {\r
-                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                log.info("building MetadataProvider of type %s...",type.get());\r
-                try {\r
-                    auto_ptr<MetadataProvider> mp(samlConf.MetadataProviderManager.newPlugin(type.get(),child));\r
-                    mp->init();\r
-                    m_metadata = mp.release();\r
-                }\r
-                catch (exception& ex) {\r
-                    log.crit("error building/initializing MetadataProvider: %s", ex.what());\r
-                }\r
-            }\r
-        }\r
-\r
-        if (conf.isEnabled(SPConfig::Trust)) {\r
-            child = XMLHelper::getFirstChildElement(e,_TrustEngine);\r
-            if (child) {\r
-                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                log.info("building TrustEngine of type %s...",type.get());\r
-                try {\r
-                    m_trust = xmlConf.TrustEngineManager.newPlugin(type.get(),child);\r
-                }\r
-                catch (exception& ex) {\r
-                    log.crit("error building TrustEngine: %s",ex.what());\r
-                }\r
-            }\r
-        }\r
-        \r
-        // Finally, load credential mappings.\r
-        child = XMLHelper::getFirstChildElement(e,CredentialUse);\r
-        if (child) {\r
-            m_credDefault=new DOMPropertySet();\r
-            m_credDefault->load(child,log,this);\r
-            child = XMLHelper::getFirstChildElement(child,RelyingParty);\r
-            while (child) {\r
-                DOMPropertySet* rp=new DOMPropertySet();\r
-                rp->load(child,log,this);\r
-                m_credMap[child->getAttributeNS(NULL,opensaml::saml2::Attribute::NAME_ATTRIB_NAME)]=rp;\r
-                child = XMLHelper::getNextSiblingElement(child,RelyingParty);\r
-            }\r
-        }\r
-        \r
-        if (conf.isEnabled(SPConfig::OutOfProcess)) {\r
-            // Really finally, build local browser profile and binding objects.\r
-            // TODO: may need some bits here...\r
-        }\r
-    }\r
-    catch (exception&) {\r
-        cleanup();\r
-        throw;\r
-    }\r
-#ifndef _DEBUG\r
-    catch (...) {\r
-        cleanup();\r
-        throw;\r
-    }\r
-#endif\r
-}\r
-\r
-void XMLApplication::cleanup()\r
-{\r
-    for_each(m_handlers.begin(),m_handlers.end(),xmltooling::cleanup<Handler>());\r
-    \r
-    delete m_credDefault;\r
-#ifdef HAVE_GOOD_STL\r
-    for_each(m_credMap.begin(),m_credMap.end(),cleanup_pair<xstring,PropertySet>());\r
-#else\r
-    for_each(m_credMap.begin(),m_credMap.end(),cleanup_pair<const XMLCh*,PropertySet>());\r
-#endif\r
-\r
-    delete m_trust;\r
-    delete m_metadata;\r
-}\r
-\r
-short XMLApplication::acceptNode(const DOMNode* node) const\r
-{\r
-    if (XMLHelper::isNodeNamed(node,samlconstants::SAML20_NS,opensaml::saml2::Attribute::LOCAL_NAME))\r
-        return FILTER_REJECT;\r
-    else if (XMLHelper::isNodeNamed(node,samlconstants::SAML20_NS,Audience::LOCAL_NAME))\r
-        return FILTER_REJECT;\r
-    const XMLCh* name=node->getLocalName();\r
-    if (XMLString::equals(name,_Application) ||\r
-        XMLString::equals(name,AssertionConsumerService::LOCAL_NAME) ||\r
-        XMLString::equals(name,SingleLogoutService::LOCAL_NAME) ||\r
-        XMLString::equals(name,ManageNameIDService::LOCAL_NAME) ||\r
-        XMLString::equals(name,SessionInitiator) ||\r
-        XMLString::equals(name,CredentialUse) ||\r
-        XMLString::equals(name,RelyingParty) ||\r
-        XMLString::equals(name,_MetadataProvider) ||\r
-        XMLString::equals(name,_TrustEngine))\r
-        return FILTER_REJECT;\r
-\r
-    return FILTER_ACCEPT;\r
-}\r
-\r
-pair<bool,bool> XMLApplication::getBool(const char* name, const char* ns) const\r
-{\r
-    pair<bool,bool> ret=DOMPropertySet::getBool(name,ns);\r
-    if (ret.first)\r
-        return ret;\r
-    return m_base ? m_base->getBool(name,ns) : ret;\r
-}\r
-\r
-pair<bool,const char*> XMLApplication::getString(const char* name, const char* ns) const\r
-{\r
-    pair<bool,const char*> ret=DOMPropertySet::getString(name,ns);\r
-    if (ret.first)\r
-        return ret;\r
-    return m_base ? m_base->getString(name,ns) : ret;\r
-}\r
-\r
-pair<bool,const XMLCh*> XMLApplication::getXMLString(const char* name, const char* ns) const\r
-{\r
-    pair<bool,const XMLCh*> ret=DOMPropertySet::getXMLString(name,ns);\r
-    if (ret.first)\r
-        return ret;\r
-    return m_base ? m_base->getXMLString(name,ns) : ret;\r
-}\r
-\r
-pair<bool,unsigned int> XMLApplication::getUnsignedInt(const char* name, const char* ns) const\r
-{\r
-    pair<bool,unsigned int> ret=DOMPropertySet::getUnsignedInt(name,ns);\r
-    if (ret.first)\r
-        return ret;\r
-    return m_base ? m_base->getUnsignedInt(name,ns) : ret;\r
-}\r
-\r
-pair<bool,int> XMLApplication::getInt(const char* name, const char* ns) const\r
-{\r
-    pair<bool,int> ret=DOMPropertySet::getInt(name,ns);\r
-    if (ret.first)\r
-        return ret;\r
-    return m_base ? m_base->getInt(name,ns) : ret;\r
-}\r
-\r
-const PropertySet* XMLApplication::getPropertySet(const char* name, const char* ns) const\r
-{\r
-    const PropertySet* ret=DOMPropertySet::getPropertySet(name,ns);\r
-    if (ret || !m_base)\r
-        return ret;\r
-    return m_base->getPropertySet(name,ns);\r
-}\r
-\r
-MetadataProvider* XMLApplication::getMetadataProvider() const\r
-{\r
-    return (!m_metadata && m_base) ? m_base->getMetadataProvider() : m_metadata;\r
-}\r
-\r
-TrustEngine* XMLApplication::getTrustEngine() const\r
-{\r
-    return (!m_trust && m_base) ? m_base->getTrustEngine() : m_trust;\r
-}\r
-\r
-const vector<const XMLCh*>& XMLApplication::getAudiences() const\r
-{\r
-    return (m_audiences.empty() && m_base) ? m_base->getAudiences() : m_audiences;\r
-}\r
-\r
-const PropertySet* XMLApplication::getCredentialUse(const EntityDescriptor* provider) const\r
-{\r
-    if (!m_credDefault && m_base)\r
-        return m_base->getCredentialUse(provider);\r
-        \r
-#ifdef HAVE_GOOD_STL\r
-    map<xstring,PropertySet*>::const_iterator i=m_credMap.find(provider->getEntityID());\r
-    if (i!=m_credMap.end())\r
-        return i->second;\r
-    const EntitiesDescriptor* group=dynamic_cast<const EntitiesDescriptor*>(provider->getParent());\r
-    while (group) {\r
-        if (group->getName()) {\r
-            i=m_credMap.find(group->getName());\r
-            if (i!=m_credMap.end())\r
-                return i->second;\r
-        }\r
-        group=dynamic_cast<const EntitiesDescriptor*>(group->getParent());\r
-    }\r
-#else\r
-    map<const XMLCh*,PropertySet*>::const_iterator i=m_credMap.begin();\r
-    for (; i!=m_credMap.end(); i++) {\r
-        if (XMLString::equals(i->first,provider->getId()))\r
-            return i->second;\r
-        const EntitiesDescriptor* group=dynamic_cast<const EntitiesDescriptor*>(provider->getParent());\r
-        while (group) {\r
-            if (XMLString::equals(i->first,group->getName()))\r
-                return i->second;\r
-            group=dynamic_cast<const EntitiesDescriptor*>(group->getParent());\r
-        }\r
-    }\r
-#endif\r
-    return m_credDefault;\r
-}\r
-\r
-const Handler* XMLApplication::getDefaultSessionInitiator() const\r
-{\r
-    if (m_sessionInitDefault) return m_sessionInitDefault;\r
-    return m_base ? m_base->getDefaultSessionInitiator() : NULL;\r
-}\r
-\r
-const Handler* XMLApplication::getSessionInitiatorById(const char* id) const\r
-{\r
-    map<string,const Handler*>::const_iterator i=m_sessionInitMap.find(id);\r
-    if (i!=m_sessionInitMap.end()) return i->second;\r
-    return m_base ? m_base->getSessionInitiatorById(id) : NULL;\r
-}\r
-\r
-const Handler* XMLApplication::getDefaultAssertionConsumerService() const\r
-{\r
-    if (m_acsDefault) return m_acsDefault;\r
-    return m_base ? m_base->getDefaultAssertionConsumerService() : NULL;\r
-}\r
-\r
-const Handler* XMLApplication::getAssertionConsumerServiceByIndex(unsigned short index) const\r
-{\r
-    map<unsigned int,const Handler*>::const_iterator i=m_acsIndexMap.find(index);\r
-    if (i!=m_acsIndexMap.end()) return i->second;\r
-    return m_base ? m_base->getAssertionConsumerServiceByIndex(index) : NULL;\r
-}\r
-\r
-const vector<const Handler*>& XMLApplication::getAssertionConsumerServicesByBinding(const XMLCh* binding) const\r
-{\r
-#ifdef HAVE_GOOD_STL\r
-    ACSBindingMap::const_iterator i=m_acsBindingMap.find(binding);\r
-#else\r
-    auto_ptr_char temp(binding);\r
-    ACSBindingMap::const_iterator i=m_acsBindingMap.find(temp.get());\r
-#endif\r
-    if (i!=m_acsBindingMap.end())\r
-        return i->second;\r
-    return m_base ? m_base->getAssertionConsumerServicesByBinding(binding) : g_noHandlers;\r
-}\r
-\r
-const Handler* XMLApplication::getHandler(const char* path) const\r
-{\r
-    string wrap(path);\r
-    map<string,const Handler*>::const_iterator i=m_handlerMap.find(wrap.substr(0,wrap.find('?')));\r
-    if (i!=m_handlerMap.end())\r
-        return i->second;\r
-    return m_base ? m_base->getHandler(path) : NULL;\r
-}\r
-\r
-short XMLConfigImpl::acceptNode(const DOMNode* node) const\r
-{\r
-    if (!XMLString::equals(node->getNamespaceURI(),shibspconstants::SHIB2SPCONFIG_NS))\r
-        return FILTER_ACCEPT;\r
-    const XMLCh* name=node->getLocalName();\r
-    if (XMLString::equals(name,Applications) ||\r
-        XMLString::equals(name,Credentials) ||\r
-        XMLString::equals(name,Extensions::LOCAL_NAME) ||\r
-        XMLString::equals(name,Implementation) ||\r
-        XMLString::equals(name,Listener) ||\r
-        XMLString::equals(name,MemoryListener) ||\r
-        XMLString::equals(name,Policy) ||\r
-        XMLString::equals(name,_RequestMapper) ||\r
-        XMLString::equals(name,_ReplayCache) ||\r
-        XMLString::equals(name,_SessionCache) ||\r
-        XMLString::equals(name,_StorageService) ||\r
-        XMLString::equals(name,TCPListener) ||\r
-        XMLString::equals(name,UnixListener))\r
-        return FILTER_REJECT;\r
-\r
-    return FILTER_ACCEPT;\r
-}\r
-\r
-void XMLConfigImpl::doExtensions(const DOMElement* e, const char* label, Category& log)\r
-{\r
-    const DOMElement* exts=XMLHelper::getFirstChildElement(e,Extensions::LOCAL_NAME);\r
-    if (exts) {\r
-        exts=XMLHelper::getFirstChildElement(exts,Library);\r
-        while (exts) {\r
-            auto_ptr_char path(exts->getAttributeNS(NULL,_path));\r
-            try {\r
-                if (path.get()) {\r
-                    XMLToolingConfig::getConfig().load_library(path.get(),(void*)exts);\r
-                    log.debug("loaded %s extension library (%s)", label, path.get());\r
-                }\r
-            }\r
-            catch (exception& e) {\r
-                const XMLCh* fatal=exts->getAttributeNS(NULL,fatal);\r
-                if (fatal && (*fatal==chLatin_t || *fatal==chDigit_1)) {\r
-                    log.fatal("unable to load mandatory %s extension library %s: %s", label, path.get(), e.what());\r
-                    throw;\r
-                }\r
-                else {\r
-                    log.crit("unable to load optional %s extension library %s: %s", label, path.get(), e.what());\r
-                }\r
-            }\r
-            exts=XMLHelper::getNextSiblingElement(exts,Library);\r
-        }\r
-    }\r
-}\r
-\r
-XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* outer) : m_requestMapper(NULL), m_outer(outer), m_document(NULL)\r
-{\r
-#ifdef _DEBUG\r
-    xmltooling::NDC ndc("XMLConfigImpl");\r
-#endif\r
-    Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");\r
-\r
-    try {\r
-        SPConfig& conf=SPConfig::getConfig();\r
-        SAMLConfig& samlConf=SAMLConfig::getConfig();\r
-        XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();\r
-        const DOMElement* SHAR=XMLHelper::getFirstChildElement(e,OutOfProcess);\r
-        const DOMElement* SHIRE=XMLHelper::getFirstChildElement(e,InProcess);\r
-\r
-        // Initialize log4cpp manually in order to redirect log messages as soon as possible.\r
-        if (conf.isEnabled(SPConfig::Logging)) {\r
-            const XMLCh* logconf=NULL;\r
-            if (conf.isEnabled(SPConfig::OutOfProcess))\r
-                logconf=SHAR->getAttributeNS(NULL,logger);\r
-            else if (conf.isEnabled(SPConfig::InProcess))\r
-                logconf=SHIRE->getAttributeNS(NULL,logger);\r
-            if (!logconf || !*logconf)\r
-                logconf=e->getAttributeNS(NULL,logger);\r
-            if (logconf && *logconf) {\r
-                auto_ptr_char logpath(logconf);\r
-                log.debug("loading new logging configuration from (%s), check log destination for status of configuration",logpath.get());\r
-                XMLToolingConfig::getConfig().log_config(logpath.get());\r
-            }\r
-            \r
-            if (first)\r
-                m_outer->m_tranLog = new TransactionLog();\r
-        }\r
-        \r
-        // First load any property sets.\r
-        load(e,log,this);\r
-\r
-        const DOMElement* child;\r
-        string plugtype;\r
-\r
-        // Much of the processing can only occur on the first instantiation.\r
-        if (first) {\r
-            // Set clock skew.\r
-            pair<bool,unsigned int> skew=getUnsignedInt("clockSkew");\r
-            if (skew.first)\r
-                xmlConf.clock_skew_secs=skew.second;\r
-\r
-            // Extensions\r
-            doExtensions(e, "global", log);\r
-            if (conf.isEnabled(SPConfig::OutOfProcess))\r
-                doExtensions(SHAR, "out of process", log);\r
-\r
-            if (conf.isEnabled(SPConfig::InProcess))\r
-                doExtensions(SHIRE, "in process", log);\r
-            \r
-            // Instantiate the ListenerService and SessionCache objects.\r
-            if (conf.isEnabled(SPConfig::Listener)) {\r
-                child=XMLHelper::getFirstChildElement(SHAR,UnixListener);\r
-                if (child)\r
-                    plugtype=UNIX_LISTENER_SERVICE;\r
-                else {\r
-                    child=XMLHelper::getFirstChildElement(SHAR,TCPListener);\r
-                    if (child)\r
-                        plugtype=TCP_LISTENER_SERVICE;\r
-                    else {\r
-                        child=XMLHelper::getFirstChildElement(SHAR,MemoryListener);\r
-                        if (child)\r
-                            plugtype=MEMORY_LISTENER_SERVICE;\r
-                        else {\r
-                            child=XMLHelper::getFirstChildElement(SHAR,Listener);\r
-                            if (child) {\r
-                                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                                if (type.get())\r
-                                    plugtype=type.get();\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-                if (child) {\r
-                    log.info("building ListenerService of type %s...", plugtype.c_str());\r
-                    m_outer->m_listener = conf.ListenerServiceManager.newPlugin(plugtype.c_str(),child);\r
-                }\r
-                else {\r
-                    log.fatal("can't build ListenerService, missing conf:Listener element?");\r
-                    throw ConfigurationException("Can't build ListenerService, missing conf:Listener element?");\r
-                }\r
-            }\r
-\r
-            if (conf.isEnabled(SPConfig::Caching)) {\r
-                if (conf.isEnabled(SPConfig::OutOfProcess)) {\r
-                    // First build any StorageServices.\r
-                    string inmemID;\r
-                    child=XMLHelper::getFirstChildElement(SHAR,_StorageService);\r
-                    while (child) {\r
-                        auto_ptr_char id(child->getAttributeNS(NULL,_id));\r
-                        auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                        try {\r
-                            log.info("building StorageService (%s) of type %s...", id.get(), type.get());\r
-                            m_outer->m_storage[id.get()] = xmlConf.StorageServiceManager.newPlugin(type.get(),child);\r
-                            if (!strcmp(type.get(),MEMORY_STORAGE_SERVICE))\r
-                                inmemID = id.get();\r
-                        }\r
-                        catch (exception& ex) {\r
-                            log.crit("failed to instantiate StorageService (%s): %s", id.get(), ex.what());\r
-                        }\r
-                        child=XMLHelper::getNextSiblingElement(child,_StorageService);\r
-                    }\r
-                \r
-                    child=XMLHelper::getFirstChildElement(SHAR,_SessionCache);\r
-                    if (child) {\r
-                        auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                        log.info("building SessionCache of type %s...",type.get());\r
-                        m_outer->m_sessionCache=conf.SessionCacheManager.newPlugin(type.get(),child);\r
-                    }\r
-                    else {\r
-                        log.warn("SessionCache unspecified, building SessionCache of type %s...",STORAGESERVICE_SESSION_CACHE);\r
-                        if (inmemID.empty()) {\r
-                            inmemID = "memory";\r
-                            log.info("no StorageServices configured, providing in-memory version for session cache");\r
-                            m_outer->m_storage[inmemID] = xmlConf.StorageServiceManager.newPlugin(MEMORY_STORAGE_SERVICE,NULL);\r
-                        }\r
-                        child = e->getOwnerDocument()->createElementNS(NULL,_SessionCache);\r
-                        auto_ptr_XMLCh ssid(inmemID.c_str());\r
-                        const_cast<DOMElement*>(child)->setAttributeNS(NULL,_StorageService,ssid.get());\r
-                        m_outer->m_sessionCache=conf.SessionCacheManager.newPlugin(STORAGESERVICE_SESSION_CACHE,child);\r
-                    }\r
-\r
-                    // Replay cache.\r
-                    StorageService* replaySS=NULL;\r
-                    child=XMLHelper::getFirstChildElement(SHAR,_ReplayCache);\r
-                    if (child) {\r
-                        auto_ptr_char ssid(child->getAttributeNS(NULL,_StorageService));\r
-                        if (ssid.get() && *ssid.get()) {\r
-                            if (m_outer->m_storage.count(ssid.get()))\r
-                                replaySS = m_outer->m_storage[ssid.get()];\r
-                            if (replaySS)\r
-                                log.info("building ReplayCache on top of StorageService (%s)...", ssid.get());\r
-                            else\r
-                                log.crit("unable to locate StorageService (%s) in configuration", ssid.get());\r
-                        }\r
-                    }\r
-                    if (!replaySS) {\r
-                        log.info("building ReplayCache using in-memory StorageService...");\r
-                        if (inmemID.empty()) {\r
-                            inmemID = "memory";\r
-                            log.info("no StorageServices configured, providing in-memory version for legacy config");\r
-                            m_outer->m_storage[inmemID] = xmlConf.StorageServiceManager.newPlugin(MEMORY_STORAGE_SERVICE,NULL);\r
-                        }\r
-                        replaySS = m_outer->m_storage[inmemID];\r
-                    }\r
-                    xmlConf.setReplayCache(new ReplayCache(replaySS));\r
-                }\r
-                else {\r
-                    log.info("building in-process SessionCache of type %s...",REMOTED_SESSION_CACHE);\r
-                    m_outer->m_sessionCache=conf.SessionCacheManager.newPlugin(REMOTED_SESSION_CACHE,NULL);\r
-                }\r
-            }\r
-        } // end of first-time-only stuff\r
-        \r
-        // Back to the fully dynamic stuff...next up is the RequestMapper.\r
-        if (conf.isEnabled(SPConfig::RequestMapping)) {\r
-            child=XMLHelper::getFirstChildElement(SHIRE,_RequestMapper);\r
-            if (child) {\r
-                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                log.info("building RequestMapper of type %s...",type.get());\r
-                m_requestMapper=conf.RequestMapperManager.newPlugin(type.get(),child);\r
-            }\r
-        }\r
-        \r
-        // Now we load the credentials map.\r
-        if (conf.isEnabled(SPConfig::Credentials)) {\r
-            child = XMLHelper::getLastChildElement(e,Credentials);\r
-            if (child) {\r
-                // Step down and process resolvers.\r
-                child=XMLHelper::getFirstChildElement(child);\r
-                while (child) {\r
-                    auto_ptr_char id(child->getAttributeNS(NULL,_id));\r
-                    auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
-                    try {\r
-                        CredentialResolver* cr=xmlConf.CredentialResolverManager.newPlugin(type.get(),child);\r
-                        m_credResolverMap[id.get()] = cr;\r
-                    }\r
-                    catch (exception& ex) {\r
-                        log.crit("failed to instantiate CredentialResolver (%s): %s", id.get(), ex.what());\r
-                    }\r
-                    child = XMLHelper::getNextSiblingElement(child);\r
-                }\r
-            }\r
-        }\r
-\r
-        // Load security policies.\r
-        child = XMLHelper::getLastChildElement(e,SecurityPolicies);\r
-        if (child) {\r
-            PolicyNodeFilter filter;\r
-            child = XMLHelper::getFirstChildElement(child,Policy);\r
-            while (child) {\r
-                auto_ptr_char id(child->getAttributeNS(NULL,_id));\r
-                pair< PropertySet*,vector<const SecurityPolicyRule*> >& rules = m_policyMap[id.get()];\r
-                rules.first = NULL;\r
-                auto_ptr<DOMPropertySet> settings(new DOMPropertySet());\r
-                settings->load(child, log, &filter);\r
-                rules.first = settings.release();\r
-                const DOMElement* rule = XMLHelper::getFirstChildElement(child,Rule);\r
-                while (rule) {\r
-                    auto_ptr_char type(rule->getAttributeNS(NULL,_type));\r
-                    try {\r
-                        rules.second.push_back(samlConf.SecurityPolicyRuleManager.newPlugin(type.get(),rule));\r
-                    }\r
-                    catch (exception& ex) {\r
-                        log.crit("error instantiating policy rule (%s) in policy (%s): %s", type.get(), id.get(), ex.what());\r
-                    }\r
-                    rule = XMLHelper::getNextSiblingElement(rule,Rule);\r
-                }\r
-                child = XMLHelper::getNextSiblingElement(child,Policy);\r
-            }\r
-        }\r
-\r
-        // Load the default application. This actually has a fixed ID of "default". ;-)\r
-        child=XMLHelper::getLastChildElement(e,Applications);\r
-        if (!child) {\r
-            log.fatal("can't build default Application object, missing conf:Applications element?");\r
-            throw ConfigurationException("can't build default Application object, missing conf:Applications element?");\r
-        }\r
-        XMLApplication* defapp=new XMLApplication(m_outer,child);\r
-        m_appmap[defapp->getId()]=defapp;\r
-        \r
-        // Load any overrides.\r
-        child = XMLHelper::getFirstChildElement(child,_Application);\r
-        while (child) {\r
-            auto_ptr<XMLApplication> iapp(new XMLApplication(m_outer,child,defapp));\r
-            if (m_appmap.count(iapp->getId()))\r
-                log.crit("found conf:Application element with duplicate id attribute (%s), skipping it", iapp->getId());\r
-            else\r
-                m_appmap[iapp->getId()]=iapp.release();\r
-\r
-            child = XMLHelper::getNextSiblingElement(child,_Application);\r
-        }\r
-    }\r
-    catch (exception&) {\r
-        this->~XMLConfigImpl();\r
-        throw;\r
-    }\r
-#ifndef _DEBUG\r
-    catch (...) {\r
-        this->~XMLConfigImpl();\r
-        throw;\r
-    }\r
-#endif\r
-}\r
-\r
-XMLConfigImpl::~XMLConfigImpl()\r
-{\r
-    for_each(m_appmap.begin(),m_appmap.end(),cleanup_pair<string,Application>());\r
-    for_each(m_credResolverMap.begin(),m_credResolverMap.end(),cleanup_pair<string,CredentialResolver>());\r
-    for (map< string,pair<PropertySet*,vector<const SecurityPolicyRule*> > >::iterator i=m_policyMap.begin(); i!=m_policyMap.end(); ++i) {\r
-        delete i->second.first;\r
-        for_each(i->second.second.begin(), i->second.second.end(), xmltooling::cleanup<SecurityPolicyRule>());\r
-    }\r
-    delete m_requestMapper;\r
-    if (m_document)\r
-        m_document->release();\r
-}\r
-\r
-pair<bool,DOMElement*> XMLConfig::load()\r
-{\r
-    // Load from source using base class.\r
-    pair<bool,DOMElement*> raw = ReloadableXMLFile::load();\r
-    \r
-    // If we own it, wrap it.\r
-    XercesJanitor<DOMDocument> docjanitor(raw.first ? raw.second->getOwnerDocument() : NULL);\r
-\r
-    XMLConfigImpl* impl = new XMLConfigImpl(raw.second,(m_impl==NULL),this);\r
-    \r
-    // If we held the document, transfer it to the impl. If we didn't, it's a no-op.\r
-    impl->setDocument(docjanitor.release());\r
-\r
-    delete m_impl;\r
-    m_impl = impl;\r
-\r
-    return make_pair(false,(DOMElement*)NULL);\r
-}\r
+/*
+ *  Copyright 2001-2010 Internet2
+ *
+ * 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
+ *
+ *     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.
+ */
+
+/**
+ * XMLServiceProvider.cpp
+ *
+ * XML-based SP configuration and mgmt.
+ */
+
+#include "internal.h"
+#include "exceptions.h"
+#include "version.h"
+#include "AccessControl.h"
+#include "Application.h"
+#include "RequestMapper.h"
+#include "ServiceProvider.h"
+#include "SessionCache.h"
+#include "SPConfig.h"
+#include "SPRequest.h"
+#include "binding/ProtocolProvider.h"
+#include "handler/LogoutInitiator.h"
+#include "handler/SessionInitiator.h"
+#include "remoting/ListenerService.h"
+#include "util/DOMPropertySet.h"
+#include "util/SPConstants.h"
+
+#if defined(XMLTOOLING_LOG4SHIB)
+# include <log4shib/PropertyConfigurator.hh>
+#elif defined(XMLTOOLING_LOG4CPP)
+# include <log4cpp/PropertyConfigurator.hh>
+#else
+# error "Supported logging library not available."
+#endif
+#include <algorithm>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/XMLStringTokenizer.hpp>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/version.h>
+#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ReloadableXMLFile.h>
+#include <xmltooling/util/TemplateEngine.h>
+#include <xmltooling/util/Threads.h>
+#include <xmltooling/util/XMLHelper.h>
+
+#ifndef SHIBSP_LITE
+# include "TransactionLog.h"
+# include "attribute/filtering/AttributeFilter.h"
+# include "attribute/resolver/AttributeExtractor.h"
+# include "attribute/resolver/AttributeResolver.h"
+# include "security/PKIXTrustEngine.h"
+# include "security/SecurityPolicyProvider.h"
+# include <saml/SAMLConfig.h>
+# include <saml/version.h>
+# include <saml/binding/ArtifactMap.h>
+# include <saml/binding/SAMLArtifact.h>
+# include <saml/saml1/core/Assertions.h>
+# include <saml/saml2/core/Assertions.h>
+# include <saml/saml2/binding/SAML2ArtifactType0004.h>
+# include <saml/saml2/metadata/Metadata.h>
+# include <saml/saml2/metadata/MetadataProvider.h>
+# include <saml/util/SAMLConstants.h>
+# include <xmltooling/security/ChainingTrustEngine.h>
+# include <xmltooling/security/CredentialResolver.h>
+# include <xmltooling/security/SecurityHelper.h>
+# include <xmltooling/util/ReplayCache.h>
+# include <xmltooling/util/StorageService.h>
+# include <xsec/utils/XSECPlatformUtils.hpp>
+using namespace opensaml::saml2;
+using namespace opensaml::saml2p;
+using namespace opensaml::saml2md;
+using namespace opensaml;
+#else
+# include "lite/SAMLConstants.h"
+#endif
+
+using namespace shibsp;
+using namespace xmltooling;
+using namespace std;
+
+#ifndef min
+# define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+namespace {
+
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4250 )
+#endif
+
+    static vector<const Handler*> g_noHandlers;
+
+    // Application configuration wrapper
+    class SHIBSP_DLLLOCAL XMLApplication : public Application, public Remoted, public DOMPropertySet, public DOMNodeFilter
+    {
+    public:
+        XMLApplication(const ServiceProvider*, const ProtocolProvider*, const DOMElement*, const XMLApplication* base=nullptr);
+        ~XMLApplication() { cleanup(); }
+
+        const char* getHash() const {return m_hash.c_str();}
+
+#ifndef SHIBSP_LITE
+        SAMLArtifact* generateSAML1Artifact(const EntityDescriptor* relyingParty) const {
+            throw ConfigurationException("No support for SAML 1.x artifact generation.");
+        }
+        SAML2Artifact* generateSAML2Artifact(const EntityDescriptor* relyingParty) const {
+            pair<bool,int> index = make_pair(false,0);
+            const PropertySet* props = getRelyingParty(relyingParty);
+            index = props->getInt("artifactEndpointIndex");
+            if (!index.first)
+                index = getArtifactEndpointIndex();
+            pair<bool,const char*> entityID = props->getString("entityID");
+            return new SAML2ArtifactType0004(
+                SecurityHelper::doHash("SHA1", entityID.second, strlen(entityID.second), false),
+                index.first ? index.second : 1
+                );
+        }
+
+        MetadataProvider* getMetadataProvider(bool required=true) const {
+            if (required && !m_base && !m_metadata)
+                throw ConfigurationException("No MetadataProvider available.");
+            return (!m_metadata && m_base) ? m_base->getMetadataProvider() : m_metadata;
+        }
+        TrustEngine* getTrustEngine(bool required=true) const {
+            if (required && !m_base && !m_trust)
+                throw ConfigurationException("No TrustEngine available.");
+            return (!m_trust && m_base) ? m_base->getTrustEngine() : m_trust;
+        }
+        AttributeExtractor* getAttributeExtractor() const {
+            return (!m_attrExtractor && m_base) ? m_base->getAttributeExtractor() : m_attrExtractor;
+        }
+        AttributeFilter* getAttributeFilter() const {
+            return (!m_attrFilter && m_base) ? m_base->getAttributeFilter() : m_attrFilter;
+        }
+        AttributeResolver* getAttributeResolver() const {
+            return (!m_attrResolver && m_base) ? m_base->getAttributeResolver() : m_attrResolver;
+        }
+        CredentialResolver* getCredentialResolver() const {
+            return (!m_credResolver && m_base) ? m_base->getCredentialResolver() : m_credResolver;
+        }
+        const PropertySet* getRelyingParty(const EntityDescriptor* provider) const;
+        const PropertySet* getRelyingParty(const XMLCh* entityID) const;
+        const vector<const XMLCh*>* getAudiences() const {
+            return (m_audiences.empty() && m_base) ? m_base->getAudiences() : &m_audiences;
+        }
+#endif
+        string getNotificationURL(const char* resource, bool front, unsigned int index) const;
+
+        const vector<string>& getRemoteUserAttributeIds() const {
+            return (m_remoteUsers.empty() && m_base) ? m_base->getRemoteUserAttributeIds() : m_remoteUsers;
+        }
+
+        void clearHeader(SPRequest& request, const char* rawname, const char* cginame) const;
+        void setHeader(SPRequest& request, const char* name, const char* value) const;
+        string getSecureHeader(const SPRequest& request, const char* name) const;
+
+        const SessionInitiator* getDefaultSessionInitiator() const;
+        const SessionInitiator* getSessionInitiatorById(const char* id) const;
+        const Handler* getDefaultAssertionConsumerService() const;
+        const Handler* getAssertionConsumerServiceByIndex(unsigned short index) const;
+        const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding=nullptr) const;
+        const vector<const Handler*>& getAssertionConsumerServicesByBinding(const XMLCh* binding) const;
+        const Handler* getHandler(const char* path) const;
+        void getHandlers(vector<const Handler*>& handlers) const;
+
+        void receive(DDF& in, ostream& out) {
+            // Only current function is to return the headers to clear.
+            DDF header;
+            DDF ret=DDF(nullptr).list();
+            DDFJanitor jret(ret);
+            for (vector< pair<string,string> >::const_iterator i = m_unsetHeaders.begin(); i!=m_unsetHeaders.end(); ++i) {
+                header = DDF(i->first.c_str()).string(i->second.c_str());
+                ret.add(header);
+            }
+            out << ret;
+        }
+
+        // Provides filter to exclude special config elements.
+#ifdef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+        short
+#else
+        FilterAction
+#endif
+        acceptNode(const DOMNode* node) const;
+
+    private:
+        void doAttributeInfo();
+        void doHandlers(const ProtocolProvider*, const DOMElement*, Category&);
+        void doSSO(const ProtocolProvider&, set<string>&, DOMElement*, Category&);
+        void doLogout(const ProtocolProvider&, set<string>&, DOMElement*, Category&);
+        void doNameIDMgmt(const ProtocolProvider&, set<string>&, DOMElement*, Category&);
+        void doArtifactResolution(const ProtocolProvider&, const char*, DOMElement*, Category&);
+        void cleanup();
+        const XMLApplication* m_base;
+        string m_hash;
+        std::pair<std::string,std::string> m_attributePrefix;
+#ifndef SHIBSP_LITE
+        void doAttributePlugins(const DOMElement* e, Category& log);
+        MetadataProvider* m_metadata;
+        TrustEngine* m_trust;
+        AttributeExtractor* m_attrExtractor;
+        AttributeFilter* m_attrFilter;
+        AttributeResolver* m_attrResolver;
+        CredentialResolver* m_credResolver;
+        vector<const XMLCh*> m_audiences;
+
+        // RelyingParty properties
+        map<xstring,PropertySet*> m_partyMap;
+#endif
+        vector<string> m_remoteUsers,m_frontLogout,m_backLogout;
+
+        // manage handler objects
+        vector<Handler*> m_handlers;
+
+        // maps location (path info) to applicable handlers
+        map<string,const Handler*> m_handlerMap;
+
+        // maps unique indexes to consumer services
+        map<unsigned int,const Handler*> m_acsIndexMap;
+
+        // pointer to default consumer service
+        const Handler* m_acsDefault;
+
+        // maps binding strings to supporting consumer service(s)
+        typedef map< xstring,vector<const Handler*> > ACSBindingMap;
+        ACSBindingMap m_acsBindingMap;
+
+        // maps protocol strings to supporting consumer service(s)
+        typedef map< xstring,vector<const Handler*> > ACSProtocolMap;
+        ACSProtocolMap m_acsProtocolMap;
+
+        // pointer to default session initiator
+        const SessionInitiator* m_sessionInitDefault;
+
+        // maps unique ID strings to session initiators
+        map<string,const SessionInitiator*> m_sessionInitMap;
+
+        // pointer to default artifact resolution service
+        const Handler* m_artifactResolutionDefault;
+
+        pair<bool,int> getArtifactEndpointIndex() const {
+            if (m_artifactResolutionDefault) return m_artifactResolutionDefault->getInt("index");
+            return m_base ? m_base->getArtifactEndpointIndex() : make_pair(false,0);
+        }
+    };
+
+    // Top-level configuration implementation
+    class SHIBSP_DLLLOCAL XMLConfig;
+    class SHIBSP_DLLLOCAL XMLConfigImpl : public DOMPropertySet, public DOMNodeFilter
+    {
+    public:
+        XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* outer, Category& log);
+        ~XMLConfigImpl();
+
+        RequestMapper* m_requestMapper;
+        map<string,Application*> m_appmap;
+#ifndef SHIBSP_LITE
+        SecurityPolicyProvider* m_policy;
+        vector< pair< string, pair<string,string> > > m_transportOptions;
+#endif
+
+        // Provides filter to exclude special config elements.
+#ifdef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+        short
+#else
+        FilterAction
+#endif
+        acceptNode(const DOMNode* node) const;
+
+        void setDocument(DOMDocument* doc) {
+            m_document = doc;
+        }
+
+    private:
+        void doExtensions(const DOMElement* e, const char* label, Category& log);
+        void doListener(const DOMElement* e, Category& log);
+        void doCaching(const DOMElement* e, Category& log);
+        void cleanup();
+
+        const XMLConfig* m_outer;
+        DOMDocument* m_document;
+    };
+
+    class SHIBSP_DLLLOCAL XMLConfig : public ServiceProvider, public ReloadableXMLFile
+#ifndef SHIBSP_LITE
+        ,public Remoted
+#endif
+    {
+    public:
+        XMLConfig(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".Config")),
+            m_impl(nullptr), m_listener(nullptr), m_sessionCache(nullptr)
+#ifndef SHIBSP_LITE
+            , m_tranLog(nullptr)
+#endif
+        {
+        }
+
+        void init() {
+            background_load();
+        }
+
+        ~XMLConfig() {
+            shutdown();
+            delete m_impl;
+            delete m_sessionCache;
+            delete m_listener;
+#ifndef SHIBSP_LITE
+            delete m_tranLog;
+            SAMLConfig::getConfig().setArtifactMap(nullptr);
+            XMLToolingConfig::getConfig().setReplayCache(nullptr);
+            for_each(m_storage.begin(), m_storage.end(), cleanup_pair<string,StorageService>());
+#endif
+        }
+
+#ifndef SHIBSP_LITE
+        // Lockable
+        Lockable* lock() {
+            ReloadableXMLFile::lock();
+            if (m_impl->m_policy)
+                m_impl->m_policy->lock();
+            return this;
+        }
+        void unlock() {
+            if (m_impl->m_policy)
+                m_impl->m_policy->unlock();
+            ReloadableXMLFile::unlock();
+        }
+#endif
+
+        // PropertySet
+        const PropertySet* getParent() const { return m_impl->getParent(); }
+        void setParent(const PropertySet* parent) {return m_impl->setParent(parent);}
+        pair<bool,bool> getBool(const char* name, const char* ns=nullptr) const {return m_impl->getBool(name,ns);}
+        pair<bool,const char*> getString(const char* name, const char* ns=nullptr) const {return m_impl->getString(name,ns);}
+        pair<bool,const XMLCh*> getXMLString(const char* name, const char* ns=nullptr) const {return m_impl->getXMLString(name,ns);}
+        pair<bool,unsigned int> getUnsignedInt(const char* name, const char* ns=nullptr) const {return m_impl->getUnsignedInt(name,ns);}
+        pair<bool,int> getInt(const char* name, const char* ns=nullptr) const {return m_impl->getInt(name,ns);}
+        void getAll(map<string,const char*>& properties) const {return m_impl->getAll(properties);}
+        const PropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:2.0:native:sp:config") const {return m_impl->getPropertySet(name,ns);}
+        const DOMElement* getElement() const {return m_impl->getElement();}
+
+        // ServiceProvider
+#ifndef SHIBSP_LITE
+        // Remoted
+        void receive(DDF& in, ostream& out);
+
+        TransactionLog* getTransactionLog() const {
+            if (m_tranLog)
+                return m_tranLog;
+            throw ConfigurationException("No TransactionLog available.");
+        }
+
+        StorageService* getStorageService(const char* id) const {
+            if (id) {
+                map<string,StorageService*>::const_iterator i=m_storage.find(id);
+                if (i!=m_storage.end())
+                    return i->second;
+            }
+            else if (!m_storage.empty())
+                return m_storage.begin()->second;
+            return nullptr;
+        }
+#endif
+
+        ListenerService* getListenerService(bool required=true) const {
+            if (required && !m_listener)
+                throw ConfigurationException("No ListenerService available.");
+            return m_listener;
+        }
+
+        SessionCache* getSessionCache(bool required=true) const {
+            if (required && !m_sessionCache)
+                throw ConfigurationException("No SessionCache available.");
+            return m_sessionCache;
+        }
+
+        RequestMapper* getRequestMapper(bool required=true) const {
+            if (required && !m_impl->m_requestMapper)
+                throw ConfigurationException("No RequestMapper available.");
+            return m_impl->m_requestMapper;
+        }
+
+        const Application* getApplication(const char* applicationId) const {
+            map<string,Application*>::const_iterator i=m_impl->m_appmap.find(applicationId ? applicationId : "default");
+            return (i!=m_impl->m_appmap.end()) ? i->second : nullptr;
+        }
+
+#ifndef SHIBSP_LITE
+        SecurityPolicyProvider* getSecurityPolicyProvider(bool required=true) const {
+            if (required && !m_impl->m_policy)
+                throw ConfigurationException("No SecurityPolicyProvider available.");
+            return m_impl->m_policy;
+        }
+
+        const PropertySet* getPolicySettings(const char* id) const {
+            return getSecurityPolicyProvider()->getPolicySettings(id);
+        }
+
+        const vector<const SecurityPolicyRule*>& getPolicyRules(const char* id) const {
+            return getSecurityPolicyProvider()->getPolicyRules(id);
+        }
+
+        bool setTransportOptions(SOAPTransport& transport) const {
+            bool ret = true;
+            vector< pair< string, pair<string,string> > >::const_iterator opt;
+            for (opt = m_impl->m_transportOptions.begin(); opt != m_impl->m_transportOptions.end(); ++opt) {
+                if (!transport.setProviderOption(opt->first.c_str(), opt->second.first.c_str(), opt->second.second.c_str())) {
+                    m_log.error("failed to set SOAPTransport option (%s)", opt->second.first.c_str());
+                    ret = false;
+                }
+            }
+            return ret;
+        }
+#endif
+
+    protected:
+        pair<bool,DOMElement*> background_load();
+
+    private:
+        friend class XMLConfigImpl;
+        XMLConfigImpl* m_impl;
+        mutable ListenerService* m_listener;
+        mutable SessionCache* m_sessionCache;
+#ifndef SHIBSP_LITE
+        mutable TransactionLog* m_tranLog;
+        mutable map<string,StorageService*> m_storage;
+#endif
+    };
+
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif
+
+    static const XMLCh applicationId[] =        UNICODE_LITERAL_13(a,p,p,l,i,c,a,t,i,o,n,I,d);
+    static const XMLCh ApplicationOverride[] =  UNICODE_LITERAL_19(A,p,p,l,i,c,a,t,i,o,n,O,v,e,r,r,i,d,e);
+    static const XMLCh ApplicationDefaults[] =  UNICODE_LITERAL_19(A,p,p,l,i,c,a,t,i,o,n,D,e,f,a,u,l,t,s);
+    static const XMLCh _ArtifactMap[] =         UNICODE_LITERAL_11(A,r,t,i,f,a,c,t,M,a,p);
+    static const XMLCh _AttributeExtractor[] =  UNICODE_LITERAL_18(A,t,t,r,i,b,u,t,e,E,x,t,r,a,c,t,o,r);
+    static const XMLCh _AttributeFilter[] =     UNICODE_LITERAL_15(A,t,t,r,i,b,u,t,e,F,i,l,t,e,r);
+    static const XMLCh _AttributeResolver[] =   UNICODE_LITERAL_17(A,t,t,r,i,b,u,t,e,R,e,s,o,l,v,e,r);
+    static const XMLCh _AssertionConsumerService[] = UNICODE_LITERAL_24(A,s,s,e,r,t,i,o,n,C,o,n,s,u,m,e,r,S,e,r,v,i,c,e);
+    static const XMLCh _ArtifactResolutionService[] =UNICODE_LITERAL_25(A,r,t,i,f,a,c,t,R,e,s,o,l,u,t,i,o,n,S,e,r,v,i,c,e);
+    static const XMLCh _Audience[] =            UNICODE_LITERAL_8(A,u,d,i,e,n,c,e);
+    static const XMLCh Binding[] =              UNICODE_LITERAL_7(B,i,n,d,i,n,g);
+    static const XMLCh Channel[]=               UNICODE_LITERAL_7(C,h,a,n,n,e,l);
+    static const XMLCh _CredentialResolver[] =  UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,l,R,e,s,o,l,v,e,r);
+    static const XMLCh _default[] =             UNICODE_LITERAL_7(d,e,f,a,u,l,t);
+    static const XMLCh _Extensions[] =          UNICODE_LITERAL_10(E,x,t,e,n,s,i,o,n,s);
+    static const XMLCh _fatal[] =               UNICODE_LITERAL_5(f,a,t,a,l);
+    static const XMLCh _Handler[] =             UNICODE_LITERAL_7(H,a,n,d,l,e,r);
+    static const XMLCh _id[] =                  UNICODE_LITERAL_2(i,d);
+    static const XMLCh _index[] =               UNICODE_LITERAL_5(i,n,d,e,x);
+    static const XMLCh InProcess[] =            UNICODE_LITERAL_9(I,n,P,r,o,c,e,s,s);
+    static const XMLCh Library[] =              UNICODE_LITERAL_7(L,i,b,r,a,r,y);
+    static const XMLCh Listener[] =             UNICODE_LITERAL_8(L,i,s,t,e,n,e,r);
+    static const XMLCh Location[] =             UNICODE_LITERAL_8(L,o,c,a,t,i,o,n);
+    static const XMLCh logger[] =               UNICODE_LITERAL_6(l,o,g,g,e,r);
+    static const XMLCh Logout[] =               UNICODE_LITERAL_6(L,o,g,o,u,t);
+    static const XMLCh _LogoutInitiator[] =     UNICODE_LITERAL_15(L,o,g,o,u,t,I,n,i,t,i,a,t,o,r);
+    static const XMLCh _ManageNameIDService[] = UNICODE_LITERAL_19(M,a,n,a,g,e,N,a,m,e,I,D,S,e,r,v,i,c,e);
+    static const XMLCh _MetadataProvider[] =    UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r);
+    static const XMLCh NameIDMgmt[] =           UNICODE_LITERAL_10(N,a,m,e,I,D,M,g,m,t);
+    static const XMLCh Notify[] =               UNICODE_LITERAL_6(N,o,t,i,f,y);
+    static const XMLCh _option[] =              UNICODE_LITERAL_6(o,p,t,i,o,n);
+    static const XMLCh OutOfProcess[] =         UNICODE_LITERAL_12(O,u,t,O,f,P,r,o,c,e,s,s);
+    static const XMLCh _path[] =                UNICODE_LITERAL_4(p,a,t,h);
+    static const XMLCh _ProtocolProvider[] =    UNICODE_LITERAL_16(P,r,o,t,o,c,o,l,P,r,o,v,i,d,e,r);
+    static const XMLCh _provider[] =            UNICODE_LITERAL_8(p,r,o,v,i,d,e,r);
+    static const XMLCh RelyingParty[] =         UNICODE_LITERAL_12(R,e,l,y,i,n,g,P,a,r,t,y);
+    static const XMLCh _ReplayCache[] =         UNICODE_LITERAL_11(R,e,p,l,a,y,C,a,c,h,e);
+    static const XMLCh _RequestMapper[] =       UNICODE_LITERAL_13(R,e,q,u,e,s,t,M,a,p,p,e,r);
+    static const XMLCh RequestMap[] =           UNICODE_LITERAL_10(R,e,q,u,e,s,t,M,a,p);
+    static const XMLCh SecurityPolicies[] =     UNICODE_LITERAL_16(S,e,c,u,r,i,t,y,P,o,l,i,c,i,e,s);
+    static const XMLCh _SecurityPolicyProvider[] = UNICODE_LITERAL_22(S,e,c,u,r,i,t,y,P,o,l,i,c,y,P,r,o,v,i,d,e,r);
+    static const XMLCh _SessionCache[] =        UNICODE_LITERAL_12(S,e,s,s,i,o,n,C,a,c,h,e);
+    static const XMLCh _SessionInitiator[] =    UNICODE_LITERAL_16(S,e,s,s,i,o,n,I,n,i,t,i,a,t,o,r);
+    static const XMLCh _SingleLogoutService[] = UNICODE_LITERAL_19(S,i,n,g,l,e,L,o,g,o,u,t,S,e,r,v,i,c,e);
+    static const XMLCh Site[] =                 UNICODE_LITERAL_4(S,i,t,e);
+    static const XMLCh SSO[] =                  UNICODE_LITERAL_3(S,S,O);
+    static const XMLCh _StorageService[] =      UNICODE_LITERAL_14(S,t,o,r,a,g,e,S,e,r,v,i,c,e);
+    static const XMLCh TCPListener[] =          UNICODE_LITERAL_11(T,C,P,L,i,s,t,e,n,e,r);
+    static const XMLCh TransportOption[] =      UNICODE_LITERAL_15(T,r,a,n,s,p,o,r,t,O,p,t,i,o,n);
+    static const XMLCh _TrustEngine[] =         UNICODE_LITERAL_11(T,r,u,s,t,E,n,g,i,n,e);
+    static const XMLCh _type[] =                UNICODE_LITERAL_4(t,y,p,e);
+    static const XMLCh UnixListener[] =         UNICODE_LITERAL_12(U,n,i,x,L,i,s,t,e,n,e,r);
+};
+
+namespace shibsp {
+    ServiceProvider* XMLServiceProviderFactory(const DOMElement* const & e)
+    {
+        return new XMLConfig(e);
+    }
+};
+
+XMLApplication::XMLApplication(
+    const ServiceProvider* sp,
+    const ProtocolProvider* pp,
+    const DOMElement* e,
+    const XMLApplication* base
+    ) : Application(sp), m_base(base),
+#ifndef SHIBSP_LITE
+        m_metadata(nullptr), m_trust(nullptr),
+        m_attrExtractor(nullptr), m_attrFilter(nullptr), m_attrResolver(nullptr),
+        m_credResolver(nullptr),
+#endif
+        m_acsDefault(nullptr), m_sessionInitDefault(nullptr), m_artifactResolutionDefault(nullptr)
+{
+#ifdef _DEBUG
+    xmltooling::NDC ndc("XMLApplication");
+#endif
+    Category& log=Category::getInstance(SHIBSP_LOGCAT".Application");
+
+    try {
+        // First load any property sets.
+        load(e,nullptr,this);
+        if (base)
+            setParent(base);
+
+        SPConfig& conf=SPConfig::getConfig();
+#ifndef SHIBSP_LITE
+        SAMLConfig& samlConf=SAMLConfig::getConfig();
+        XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();
+#endif
+
+        // This used to be an actual hash, but now it's just a hex-encode to avoid xmlsec dependency.
+        static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+        string tohash=getId();
+        tohash+=getString("entityID").second;
+        for (const char* ch = tohash.c_str(); *ch; ++ch) {
+            m_hash += (DIGITS[((unsigned char)(0xF0 & *ch)) >> 4 ]);
+            m_hash += (DIGITS[0x0F & *ch]);
+        }
+
+        doAttributeInfo();
+
+        if (conf.isEnabled(SPConfig::Handlers))
+            doHandlers(pp, e, log);
+
+        // Notification.
+        DOMNodeList* nlist = e->getElementsByTagNameNS(shibspconstants::SHIB2SPCONFIG_NS, Notify);
+        for (XMLSize_t i = 0; nlist && i < nlist->getLength(); ++i) {
+            if (nlist->item(i)->getParentNode()->isSameNode(e)) {
+                const XMLCh* channel = static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(nullptr, Channel);
+                string loc(XMLHelper::getAttrString(static_cast<DOMElement*>(nlist->item(i)), nullptr, Location));
+                if (!loc.empty()) {
+                    if (channel && *channel == chLatin_f)
+                        m_frontLogout.push_back(loc);
+                    else
+                        m_backLogout.push_back(loc);
+                }
+            }
+        }
+
+#ifndef SHIBSP_LITE
+        nlist = e->getElementsByTagNameNS(samlconstants::SAML20_NS, Audience::LOCAL_NAME);
+        if (nlist && nlist->getLength()) {
+            log.warn("use of <saml:Audience> elements outside of a Security Policy Rule is deprecated");
+            for (XMLSize_t i = 0; i < nlist->getLength(); ++i)
+                if (nlist->item(i)->getParentNode()->isSameNode(e) && nlist->item(i)->hasChildNodes())
+                    m_audiences.push_back(nlist->item(i)->getFirstChild()->getNodeValue());
+        }
+
+        const DOMElement* child;
+
+        if (conf.isEnabled(SPConfig::Metadata)) {
+            child = XMLHelper::getFirstChildElement(e, _MetadataProvider);
+            if (child) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                try {
+                    if (!t.empty()) {
+                        log.info("building MetadataProvider of type %s...", t.c_str());
+                        auto_ptr<MetadataProvider> mp(samlConf.MetadataProviderManager.newPlugin(t.c_str(), child));
+                        mp->init();
+                        m_metadata = mp.release();
+                    }
+                    else {
+                        throw ConfigurationException("MetadataProvider element had no type attribute.");
+                    }
+                }
+                catch (exception& ex) {
+                    log.crit("error building/initializing MetadataProvider: %s", ex.what());
+                }
+            }
+        }
+
+        if (conf.isEnabled(SPConfig::Trust)) {
+            child = XMLHelper::getFirstChildElement(e, _TrustEngine);
+            if (child) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                try {
+                    if (!t.empty()) {
+                        log.info("building TrustEngine of type %s...", t.c_str());
+                        m_trust = xmlConf.TrustEngineManager.newPlugin(t.c_str(), child);
+                    }
+                    else {
+                        throw ConfigurationException("TrustEngine element had no type attribute.");
+                    }
+                }
+                catch (exception& ex) {
+                    log.crit("error building TrustEngine: %s", ex.what());
+                }
+            }
+            else if (!m_base) {
+                log.info(
+                    "no TrustEngine specified, using default chain {%s, %s}",
+                    EXPLICIT_KEY_TRUSTENGINE, SHIBBOLETH_PKIX_TRUSTENGINE
+                    );
+                m_trust = xmlConf.TrustEngineManager.newPlugin(CHAINING_TRUSTENGINE, nullptr);
+                ChainingTrustEngine* trustchain = dynamic_cast<ChainingTrustEngine*>(m_trust);
+                if (trustchain) {
+                    trustchain->addTrustEngine(xmlConf.TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, nullptr));
+                    trustchain->addTrustEngine(xmlConf.TrustEngineManager.newPlugin(SHIBBOLETH_PKIX_TRUSTENGINE, nullptr));
+                }
+            }
+        }
+
+        if (conf.isEnabled(SPConfig::AttributeResolution))
+            doAttributePlugins(e, log);
+
+        if (conf.isEnabled(SPConfig::Credentials)) {
+            child = XMLHelper::getFirstChildElement(e,_CredentialResolver);
+            if (child) {
+                auto_ptr_char type(child->getAttributeNS(nullptr,_type));
+                log.info("building CredentialResolver of type %s...",type.get());
+                try {
+                    m_credResolver = xmlConf.CredentialResolverManager.newPlugin(type.get(),child);
+                }
+                catch (exception& ex) {
+                    log.crit("error building CredentialResolver: %s", ex.what());
+                }
+            }
+        }
+
+        // Finally, load relying parties.
+        child = XMLHelper::getFirstChildElement(e, RelyingParty);
+        while (child) {
+            if (child->hasAttributeNS(nullptr, saml2::Attribute::NAME_ATTRIB_NAME)) {
+                auto_ptr<DOMPropertySet> rp(new DOMPropertySet());
+                rp->load(child, nullptr, this);
+                rp->setParent(this);
+                m_partyMap[child->getAttributeNS(nullptr, saml2::Attribute::NAME_ATTRIB_NAME)] = rp.release();
+            }
+            child = XMLHelper::getNextSiblingElement(child, RelyingParty);
+        }
+        if (base && m_partyMap.empty() && !base->m_partyMap.empty()) {
+            // For inheritance of RPs to work, we have to pull them in to the override by cloning the DOM.
+            child = XMLHelper::getFirstChildElement(base->getElement(), RelyingParty);
+            while (child) {
+                if (child->hasAttributeNS(nullptr, saml2::Attribute::NAME_ATTRIB_NAME)) {
+                    DOMElement* rpclone = static_cast<DOMElement*>(child->cloneNode(true));
+                    auto_ptr<DOMPropertySet> rp(new DOMPropertySet());
+                    rp->load(rpclone, nullptr, this);
+                    rp->setParent(this);
+                    m_partyMap[rpclone->getAttributeNS(nullptr, saml2::Attribute::NAME_ATTRIB_NAME)] = rp.release();
+                }
+                child = XMLHelper::getNextSiblingElement(child, RelyingParty);
+            }
+        }
+#endif
+
+        // Out of process only, we register a listener endpoint.
+        if (!conf.isEnabled(SPConfig::InProcess)) {
+            ListenerService* listener = sp->getListenerService(false);
+            if (listener) {
+                string addr=string(getId()) + "::getHeaders::Application";
+                listener->regListener(addr.c_str(),this);
+            }
+            else {
+                log.info("no ListenerService available, Application remoting disabled");
+            }
+        }
+    }
+    catch (exception&) {
+        cleanup();
+        throw;
+    }
+#ifndef _DEBUG
+    catch (...) {
+        cleanup();
+        throw;
+    }
+#endif
+}
+
+void XMLApplication::doAttributeInfo()
+{
+    // Populate prefix pair.
+    m_attributePrefix.second = "HTTP_";
+    pair<bool,const char*> prefix = getString("attributePrefix");
+    if (prefix.first) {
+        m_attributePrefix.first = prefix.second;
+        const char* pch = prefix.second;
+        while (*pch) {
+            m_attributePrefix.second += (isalnum(*pch) ? toupper(*pch) : '_');
+            pch++;
+        }
+    }
+
+    // Load attribute ID lists for REMOTE_USER and header clearing.
+    if (SPConfig::getConfig().isEnabled(SPConfig::InProcess)) {
+        pair<bool,const char*> attributes = getString("REMOTE_USER");
+        if (attributes.first) {
+            char* dup = strdup(attributes.second);
+            char* pos;
+            char* start = dup;
+            while (start && *start) {
+                while (*start && isspace(*start))
+                    start++;
+                if (!*start)
+                    break;
+                pos = strchr(start,' ');
+                if (pos)
+                    *pos=0;
+                m_remoteUsers.push_back(start);
+                start = pos ? pos+1 : nullptr;
+            }
+            free(dup);
+        }
+
+        attributes = getString("unsetHeaders");
+        if (attributes.first) {
+            string transformedprefix(m_attributePrefix.second);
+            const char* pch;
+            prefix = getString("metadataAttributePrefix");
+            if (prefix.first) {
+                pch = prefix.second;
+                while (*pch) {
+                    transformedprefix += (isalnum(*pch) ? toupper(*pch) : '_');
+                    pch++;
+                }
+            }
+            char* dup = strdup(attributes.second);
+            char* pos;
+            char* start = dup;
+            while (start && *start) {
+                while (*start && isspace(*start))
+                    start++;
+                if (!*start)
+                    break;
+                pos = strchr(start,' ');
+                if (pos)
+                    *pos=0;
+
+                string transformed;
+                pch = start;
+                while (*pch) {
+                    transformed += (isalnum(*pch) ? toupper(*pch) : '_');
+                    pch++;
+                }
+
+                m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + start, m_attributePrefix.second + transformed));
+                if (prefix.first)
+                    m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + prefix.second + start, transformedprefix + transformed));
+                start = pos ? pos+1 : nullptr;
+            }
+            free(dup);
+            m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + "Shib-Application-ID", m_attributePrefix.second + "SHIB_APPLICATION_ID"));
+        }
+    }
+}
+
+void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, Category& log)
+{
+    SPConfig& conf = SPConfig::getConfig();
+
+    Handler* handler = nullptr;
+    const PropertySet* sessions = getPropertySet("Sessions");
+
+    // Process assertion export handler.
+    pair<bool,const char*> location = sessions ? sessions->getString("exportLocation") : pair<bool,const char*>(false,nullptr);
+    if (location.first) {
+        try {
+            DOMElement* exportElement = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS, _Handler);
+            exportElement->setAttributeNS(nullptr,Location,sessions->getXMLString("exportLocation").second);
+            pair<bool,const XMLCh*> exportACL = sessions->getXMLString("exportACL");
+            if (exportACL.first) {
+                static const XMLCh _acl[] = UNICODE_LITERAL_9(e,x,p,o,r,t,A,C,L);
+                exportElement->setAttributeNS(nullptr,_acl,exportACL.second);
+            }
+            handler = conf.HandlerManager.newPlugin(
+                samlconstants::SAML20_BINDING_URI, pair<const DOMElement*,const char*>(exportElement, getId())
+                );
+            m_handlers.push_back(handler);
+
+            // Insert into location map. If it contains the handlerURL, we skip past that part.
+            const char* hurl = sessions->getString("handlerURL").second;
+            if (!hurl)
+                hurl = "/Shibboleth.sso";
+            const char* pch = strstr(location.second, hurl);
+            if (pch)
+                location.second = pch + strlen(hurl);
+            if (*location.second == '/')
+                m_handlerMap[location.second]=handler;
+            else
+                m_handlerMap[string("/") + location.second]=handler;
+        }
+        catch (exception& ex) {
+            log.error("caught exception installing assertion lookup handler: %s", ex.what());
+        }
+    }
+
+    // Look for "shorthand" elements first.
+    set<string> protocols;
+    DOMElement* child = sessions ? XMLHelper::getFirstChildElement(sessions->getElement()) : nullptr;
+    while (child) {
+        if (XMLHelper::isNodeNamed(child, shibspconstants::SHIB2SPCONFIG_NS, SSO)) {
+            if (pp)
+                doSSO(*pp, protocols, child, log);
+            else
+                log.error("no ProtocolProvider, SSO auto-configure unsupported");
+        }
+        else if (XMLHelper::isNodeNamed(child, shibspconstants::SHIB2SPCONFIG_NS, Logout)) {
+            if (pp)
+                doLogout(*pp, protocols, child, log);
+            else
+                log.error("no ProtocolProvider, Logout auto-configure unsupported");
+        }
+        else if (XMLHelper::isNodeNamed(child, shibspconstants::SHIB2SPCONFIG_NS, NameIDMgmt)) {
+            if (pp)
+                doNameIDMgmt(*pp, protocols, child, log);
+            else
+                log.error("no ProtocolProvider, NameIDMgmt auto-configure unsupported");
+        }
+        else {
+            break;  // drop into next while loop
+        }
+        child = XMLHelper::getNextSiblingElement(child);
+    }
+
+    // Process other handlers.
+    bool hardACS=false, hardSessionInit=false, hardArt=false;
+    while (child) {
+        if (!child->hasAttributeNS(nullptr, Location)) {
+            auto_ptr_char hclass(child->getLocalName());
+            log.error("%s handler with no Location property cannot be processed", hclass.get());
+            child = XMLHelper::getNextSiblingElement(child);
+            continue;
+        }
+        try {
+            if (XMLString::equals(child->getLocalName(), _AssertionConsumerService)) {
+                string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
+                if (bindprop.empty()) {
+                    log.error("AssertionConsumerService element has no Binding attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.AssertionConsumerServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId()));
+                // Map by binding and protocol (may be > 1 per protocol and binding)
+                m_acsBindingMap[handler->getXMLString("Binding").second].push_back(handler);
+                const XMLCh* protfamily = handler->getProtocolFamily();
+                if (protfamily)
+                    m_acsProtocolMap[protfamily].push_back(handler);
+                m_acsIndexMap[handler->getUnsignedInt("index").second] = handler;
+
+                if (!hardACS) {
+                    pair<bool,bool> defprop = handler->getBool("isDefault");
+                    if (defprop.first) {
+                        if (defprop.second) {
+                            hardACS = true;
+                            m_acsDefault = handler;
+                        }
+                    }
+                    else if (!m_acsDefault)
+                        m_acsDefault = handler;
+                }
+            }
+            else if (XMLString::equals(child->getLocalName(), _SessionInitiator)) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                if (t.empty()) {
+                    log.error("SessionInitiator element has no type attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                SessionInitiator* sihandler = conf.SessionInitiatorManager.newPlugin(t.c_str(), make_pair(child, getId()));
+                handler = sihandler;
+                pair<bool,const char*> si_id = handler->getString("id");
+                if (si_id.first && si_id.second)
+                    m_sessionInitMap[si_id.second] = sihandler;
+                if (!hardSessionInit) {
+                    pair<bool,bool> defprop = handler->getBool("isDefault");
+                    if (defprop.first) {
+                        if (defprop.second) {
+                            hardSessionInit = true;
+                            m_sessionInitDefault = sihandler;
+                        }
+                    }
+                    else if (!m_sessionInitDefault) {
+                        m_sessionInitDefault = sihandler;
+                    }
+                }
+            }
+            else if (XMLString::equals(child->getLocalName(), _LogoutInitiator)) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                if (t.empty()) {
+                    log.error("LogoutInitiator element has no type attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.LogoutInitiatorManager.newPlugin(t.c_str(), make_pair(child, getId()));
+            }
+            else if (XMLString::equals(child->getLocalName(), _ArtifactResolutionService)) {
+                string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
+                if (bindprop.empty()) {
+                    log.error("ArtifactResolutionService element has no Binding attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.ArtifactResolutionServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId()));
+
+                if (!hardArt) {
+                    pair<bool,bool> defprop = handler->getBool("isDefault");
+                    if (defprop.first) {
+                        if (defprop.second) {
+                            hardArt = true;
+                            m_artifactResolutionDefault = handler;
+                        }
+                    }
+                    else if (!m_artifactResolutionDefault)
+                        m_artifactResolutionDefault = handler;
+                }
+            }
+            else if (XMLString::equals(child->getLocalName(), _SingleLogoutService)) {
+                string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
+                if (bindprop.empty()) {
+                    log.error("SingleLogoutService element has no Binding attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.SingleLogoutServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId()));
+            }
+            else if (XMLString::equals(child->getLocalName(), _ManageNameIDService)) {
+                string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
+                if (bindprop.empty()) {
+                    log.error("ManageNameIDService element has no Binding attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.ManageNameIDServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId()));
+            }
+            else {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                if (t.empty()) {
+                    log.error("Handler element has no type attribute, skipping it...");
+                    child = XMLHelper::getNextSiblingElement(child);
+                    continue;
+                }
+                handler = conf.HandlerManager.newPlugin(t.c_str(), make_pair(child, getId()));
+            }
+
+            m_handlers.push_back(handler);
+
+            // Insert into location map.
+            location = handler->getString("Location");
+            if (location.first && *location.second == '/')
+                m_handlerMap[location.second] = handler;
+            else if (location.first)
+                m_handlerMap[string("/") + location.second] = handler;
+        }
+        catch (exception& ex) {
+            log.error("caught exception processing handler element: %s", ex.what());
+        }
+
+        child = XMLHelper::getNextSiblingElement(child);
+    }
+}
+
+void XMLApplication::doSSO(const ProtocolProvider& pp, set<string>& protocols, DOMElement* e, Category& log)
+{
+    if (!e->hasChildNodes())
+        return;
+
+    SPConfig& conf = SPConfig::getConfig();
+
+    // Tokenize the protocol list inside the element.
+    const XMLCh* protlist = e->getFirstChild()->getNodeValue();
+    XMLStringTokenizer prottokens(protlist);
+    while (prottokens.hasMoreTokens()) {
+        auto_ptr_char prot(prottokens.nextToken());
+
+        // Look for initiator.
+        const PropertySet* initiator = pp.getInitiator(prot.get(), "SSO");
+        if (initiator) {
+            log.info("auto-configuring SSO initiation for protocol (%s)", prot.get());
+            pair<bool,const XMLCh*> inittype = initiator->getXMLString("id");
+            if (inittype.first) {
+                // Append a session initiator element of the designated type to the root element.
+                DOMElement* sidom = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS, _SessionInitiator);
+                sidom->setAttributeNS(nullptr, _type, inittype.second);
+                e->appendChild(sidom);
+                log.info("adding SessionInitiator of type (%s) to chain (/Login)", initiator->getString("id").second);
+
+                doArtifactResolution(pp, prot.get(), e, log);
+                protocols.insert(prot.get());
+            }
+            else {
+                log.error("missing id property on Initiator element, check config for protocol (%s)", prot.get());
+            }
+        }
+
+        // Look for incoming bindings.
+        const vector<const PropertySet*>& bindings = pp.getBindings(prot.get(), "SSO");
+        if (!bindings.empty()) {
+            log.info("auto-configuring SSO endpoints for protocol (%s)", prot.get());
+            int index = 0;
+            pair<bool,const XMLCh*> idprop,pathprop;
+            for (vector<const PropertySet*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b, ++index) {
+                idprop = (*b)->getXMLString("id");
+                pathprop = (*b)->getXMLString("path");
+                if (idprop.first && pathprop.first) {
+                    DOMElement* acsdom = e->getOwnerDocument()->createElementNS(samlconstants::SAML20MD_NS, _AssertionConsumerService);
+                    acsdom->setAttributeNS(nullptr, Binding, idprop.second);
+                    acsdom->setAttributeNS(nullptr, Location, pathprop.second);
+                    xstring indexbuf(chDigit_1 + (index % 10), 1);
+                    if (index / 10)
+                        indexbuf = (XMLCh)(chDigit_1 + (index / 10)) + indexbuf;
+                    acsdom->setAttributeNS(nullptr, _index, indexbuf.c_str());
+
+                    log.info("adding AssertionConsumerService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second);
+                    Handler* handler = conf.AssertionConsumerServiceManager.newPlugin((*b)->getString("id").second, make_pair(acsdom, getId()));
+                    m_handlers.push_back(handler);
+
+                    // Setup maps and defaults.
+                    m_acsBindingMap[handler->getXMLString("Binding").second].push_back(handler);
+                    const XMLCh* protfamily = handler->getProtocolFamily();
+                    if (protfamily)
+                        m_acsProtocolMap[protfamily].push_back(handler);
+                    m_acsIndexMap[handler->getUnsignedInt("index").second] = handler;
+                    if (!m_acsDefault)
+                        m_acsDefault = handler;
+
+                    // Insert into location map.
+                    pair<bool,const char*> location = handler->getString("Location");
+                    if (location.first && *location.second == '/')
+                        m_handlerMap[location.second] = handler;
+                    else if (location.first)
+                        m_handlerMap[string("/") + location.second] = handler;
+                }
+                else {
+                    log.error("missing id or path property on Binding element, check config for protocol (%s)", prot.get());
+                }
+            }
+        }
+
+        if (!initiator && bindings.empty()) {
+            log.error("no SSO Initiator or Binding config for protocol (%s)", prot.get());
+        }
+    }
+
+    // Handle discovery.
+    static const XMLCh discoveryProtocol[] = UNICODE_LITERAL_17(d,i,s,c,o,v,e,r,y,P,r,o,t,o,c,o,l);
+    static const XMLCh discoveryURL[] = UNICODE_LITERAL_12(d,i,s,c,o,v,e,r,y,U,R,L);
+    static const XMLCh _URL[] = UNICODE_LITERAL_3(U,R,L);
+    const XMLCh* discop = e->getAttributeNS(nullptr, discoveryProtocol);
+    if (discop && *discop) {
+        const XMLCh* discou = e->getAttributeNS(nullptr, discoveryURL);
+        if (discou && *discou) {
+            // Append a session initiator element of the designated type to the root element.
+            DOMElement* sidom = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS, _SessionInitiator);
+            sidom->setAttributeNS(nullptr, _type, discop);
+            sidom->setAttributeNS(nullptr, _URL, discou);
+            e->appendChild(sidom);
+            if (log.isInfoEnabled()) {
+                auto_ptr_char dp(discop);
+                log.info("adding SessionInitiator of type (%s) to chain (/Login)", dp.get());
+            }
+        }
+        else {
+            log.error("SSO discoveryProtocol specified without discoveryURL");
+        }
+    }
+
+    // Attach default Location to SSO element.
+    static const XMLCh _loc[] = { chForwardSlash, chLatin_L, chLatin_o, chLatin_g, chLatin_i, chLatin_n, chNull };
+    e->setAttributeNS(nullptr, Location, _loc);
+
+    // Instantiate Chaining initiator around the SSO element.
+    SessionInitiator* chain = conf.SessionInitiatorManager.newPlugin(CHAINING_SESSION_INITIATOR, make_pair(e, getId()));
+    m_handlers.push_back(chain);
+    m_sessionInitDefault = chain;
+    m_handlerMap["/Login"] = chain;
+}
+
+void XMLApplication::doLogout(const ProtocolProvider& pp, set<string>& protocols, DOMElement* e, Category& log)
+{
+    if (!e->hasChildNodes())
+        return;
+
+    SPConfig& conf = SPConfig::getConfig();
+
+    // Tokenize the protocol list inside the element.
+    const XMLCh* protlist = e->getFirstChild()->getNodeValue();
+    XMLStringTokenizer prottokens(protlist);
+    while (prottokens.hasMoreTokens()) {
+        auto_ptr_char prot(prottokens.nextToken());
+
+        // Look for initiator.
+        const PropertySet* initiator = pp.getInitiator(prot.get(), "Logout");
+        if (initiator) {
+            log.info("auto-configuring Logout initiation for protocol (%s)", prot.get());
+            pair<bool,const XMLCh*> inittype = initiator->getXMLString("id");
+            if (inittype.first) {
+                // Append a logout initiator element of the designated type to the root element.
+                DOMElement* lidom = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS, _LogoutInitiator);
+                lidom->setAttributeNS(nullptr, _type, inittype.second);
+                e->appendChild(lidom);
+                log.info("adding LogoutInitiator of type (%s) to chain (/Logout)", initiator->getString("id").second);
+
+                if (protocols.count(prot.get()) == 0) {
+                    doArtifactResolution(pp, prot.get(), e, log);
+                    protocols.insert(prot.get());
+                }
+            }
+            else {
+                log.error("missing id property on Initiator element, check config for protocol (%s)", prot.get());
+            }
+        }
+
+        // Look for incoming bindings.
+        const vector<const PropertySet*>& bindings = pp.getBindings(prot.get(), "Logout");
+        if (!bindings.empty()) {
+            log.info("auto-configuring Logout endpoints for protocol (%s)", prot.get());
+            pair<bool,const XMLCh*> idprop,pathprop;
+            for (vector<const PropertySet*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
+                idprop = (*b)->getXMLString("id");
+                pathprop = (*b)->getXMLString("path");
+                if (idprop.first && pathprop.first) {
+                    DOMElement* slodom = e->getOwnerDocument()->createElementNS(samlconstants::SAML20MD_NS, _SingleLogoutService);
+                    slodom->setAttributeNS(nullptr, Binding, idprop.second);
+                    slodom->setAttributeNS(nullptr, Location, pathprop.second);
+
+                    log.info("adding SingleLogoutService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second);
+                    Handler* handler = conf.SingleLogoutServiceManager.newPlugin((*b)->getString("id").second, make_pair(slodom, getId()));
+                    m_handlers.push_back(handler);
+
+                    // Insert into location map.
+                    pair<bool,const char*> location = handler->getString("Location");
+                    if (location.first && *location.second == '/')
+                        m_handlerMap[location.second] = handler;
+                    else if (location.first)
+                        m_handlerMap[string("/") + location.second] = handler;
+                }
+                else {
+                    log.error("missing id or path property on Binding element, check config for protocol (%s)", prot.get());
+                }
+            }
+
+            if (protocols.count(prot.get()) == 0) {
+                doArtifactResolution(pp, prot.get(), e, log);
+                protocols.insert(prot.get());
+            }
+        }
+
+        if (!initiator && bindings.empty()) {
+            log.error("no Logout Initiator or Binding config for protocol (%s)", prot.get());
+        }
+    }
+
+    // Attach default Location to Logout element.
+    static const XMLCh _loc[] = { chForwardSlash, chLatin_L, chLatin_o, chLatin_g, chLatin_o, chLatin_u, chLatin_t, chNull };
+    e->setAttributeNS(nullptr, Location, _loc);
+
+    // Instantiate Chaining initiator around the SSO element.
+    Handler* chain = conf.LogoutInitiatorManager.newPlugin(CHAINING_LOGOUT_INITIATOR, make_pair(e, getId()));
+    m_handlers.push_back(chain);
+    m_handlerMap["/Logout"] = chain;
+}
+
+void XMLApplication::doNameIDMgmt(const ProtocolProvider& pp, set<string>& protocols, DOMElement* e, Category& log)
+{
+    if (!e->hasChildNodes())
+        return;
+
+    SPConfig& conf = SPConfig::getConfig();
+
+    // Tokenize the protocol list inside the element.
+    const XMLCh* protlist = e->getFirstChild()->getNodeValue();
+    XMLStringTokenizer prottokens(protlist);
+    while (prottokens.hasMoreTokens()) {
+        auto_ptr_char prot(prottokens.nextToken());
+
+        // Look for incoming bindings.
+        const vector<const PropertySet*>& bindings = pp.getBindings(prot.get(), "NameIDMgmt");
+        if (!bindings.empty()) {
+            log.info("auto-configuring NameIDMgmt endpoints for protocol (%s)", prot.get());
+            pair<bool,const XMLCh*> idprop,pathprop;
+            for (vector<const PropertySet*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
+                idprop = (*b)->getXMLString("id");
+                pathprop = (*b)->getXMLString("path");
+                if (idprop.first && pathprop.first) {
+                    DOMElement* nimdom = e->getOwnerDocument()->createElementNS(samlconstants::SAML20MD_NS, _ManageNameIDService);
+                    nimdom->setAttributeNS(nullptr, Binding, idprop.second);
+                    nimdom->setAttributeNS(nullptr, Location, pathprop.second);
+
+                    log.info("adding ManageNameIDService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second);
+                    Handler* handler = conf.ManageNameIDServiceManager.newPlugin((*b)->getString("id").second, make_pair(nimdom, getId()));
+                    m_handlers.push_back(handler);
+
+                    // Insert into location map.
+                    pair<bool,const char*> location = handler->getString("Location");
+                    if (location.first && *location.second == '/')
+                        m_handlerMap[location.second] = handler;
+                    else if (location.first)
+                        m_handlerMap[string("/") + location.second] = handler;
+                }
+                else {
+                    log.error("missing id or path property on Binding element, check config for protocol (%s)", prot.get());
+                }
+            }
+
+            if (protocols.count(prot.get()) == 0) {
+                doArtifactResolution(pp, prot.get(), e, log);
+                protocols.insert(prot.get());
+            }
+        }
+        else {
+            log.error("no NameIDMgmt Binding config for protocol (%s)", prot.get());
+        }
+    }
+}
+
+void XMLApplication::doArtifactResolution(const ProtocolProvider& pp, const char* protocol, DOMElement* e, Category& log)
+{
+    SPConfig& conf = SPConfig::getConfig();
+
+    // Look for incoming bindings.
+    const vector<const PropertySet*>& bindings = pp.getBindings(protocol, "ArtifactResolution");
+    if (!bindings.empty()) {
+        log.info("auto-configuring ArtifactResolution endpoints for protocol (%s)", protocol);
+        int index = 0;
+        pair<bool,const XMLCh*> idprop,pathprop;
+        for (vector<const PropertySet*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
+            idprop = (*b)->getXMLString("id");
+            pathprop = (*b)->getXMLString("path");
+            if (idprop.first && pathprop.first) {
+                DOMElement* artdom = e->getOwnerDocument()->createElementNS(samlconstants::SAML20MD_NS, _ArtifactResolutionService);
+                artdom->setAttributeNS(nullptr, Binding, idprop.second);
+                artdom->setAttributeNS(nullptr, Location, pathprop.second);
+                xstring indexbuf(chDigit_1 + (index % 10), 1);
+                if (index / 10)
+                    indexbuf = (XMLCh)(chDigit_1 + (index / 10)) + indexbuf;
+                artdom->setAttributeNS(nullptr, _index, indexbuf.c_str());
+
+                log.info("adding ArtifactResolutionService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second);
+                Handler* handler = conf.ArtifactResolutionServiceManager.newPlugin((*b)->getString("id").second, make_pair(artdom, getId()));
+                m_handlers.push_back(handler);
+
+                if (!m_artifactResolutionDefault)
+                    m_artifactResolutionDefault = handler;
+
+                // Insert into location map.
+                pair<bool,const char*> location = handler->getString("Location");
+                if (location.first && *location.second == '/')
+                    m_handlerMap[location.second] = handler;
+                else if (location.first)
+                    m_handlerMap[string("/") + location.second] = handler;
+            }
+            else {
+                log.error("missing id or path property on Binding element, check config for protocol (%s)", protocol);
+            }
+        }
+    }
+}
+
+#ifndef SHIBSP_LITE
+void XMLApplication::doAttributePlugins(const DOMElement* e, Category& log)
+{
+    SPConfig& conf = SPConfig::getConfig();
+
+    DOMElement* child = XMLHelper::getFirstChildElement(e, _AttributeExtractor);
+    if (child) {
+        string t(XMLHelper::getAttrString(child, nullptr, _type));
+        try {
+            if (!t.empty()) {
+                log.info("building AttributeExtractor of type %s...", t.c_str());
+                m_attrExtractor = conf.AttributeExtractorManager.newPlugin(t.c_str(), child);
+            }
+            else {
+                throw ConfigurationException("AttributeExtractor element had no type attribute.");
+            }
+        }
+        catch (exception& ex) {
+            log.crit("error building AttributeExtractor: %s", ex.what());
+        }
+    }
+
+    child = XMLHelper::getFirstChildElement(e, _AttributeFilter);
+    if (child) {
+        string t(XMLHelper::getAttrString(child, nullptr, _type));
+        try {
+            if (!t.empty()) {
+                log.info("building AttributeFilter of type %s...", t.c_str());
+                m_attrFilter = conf.AttributeFilterManager.newPlugin(t.c_str(), child);
+            }
+            else {
+                throw ConfigurationException("AttributeFilter element had no type attribute.");
+            }
+        }
+        catch (exception& ex) {
+            log.crit("error building AttributeFilter: %s", ex.what());
+        }
+    }
+
+    child = XMLHelper::getFirstChildElement(e, _AttributeResolver);
+    if (child) {
+        string t(XMLHelper::getAttrString(child, nullptr, _type));
+        try {
+            if (!t.empty()) {
+                log.info("building AttributeResolver of type %s...", t.c_str());
+                m_attrResolver = conf.AttributeResolverManager.newPlugin(t.c_str(), child);
+            }
+            else {
+                throw ConfigurationException("AttributeResolver element had no type attribute.");
+            }
+        }
+        catch (exception& ex) {
+            log.crit("error building AttributeResolver: %s", ex.what());
+        }
+    }
+
+    if (m_unsetHeaders.empty()) {
+        vector<string> unsetHeaders;
+        if (m_attrExtractor) {
+            Locker extlock(m_attrExtractor);
+            m_attrExtractor->getAttributeIds(unsetHeaders);
+        }
+        else if (m_base && m_base->m_attrExtractor) {
+            Locker extlock(m_base->m_attrExtractor);
+            m_base->m_attrExtractor->getAttributeIds(unsetHeaders);
+        }
+        if (m_attrResolver) {
+            Locker reslock(m_attrResolver);
+            m_attrResolver->getAttributeIds(unsetHeaders);
+        }
+        else if (m_base && m_base->m_attrResolver) {
+            Locker extlock(m_base->m_attrResolver);
+            m_base->m_attrResolver->getAttributeIds(unsetHeaders);
+        }
+        if (!unsetHeaders.empty()) {
+            string transformedprefix(m_attributePrefix.second);
+            const char* pch;
+            pair<bool,const char*> prefix = getString("metadataAttributePrefix");
+            if (prefix.first) {
+                pch = prefix.second;
+                while (*pch) {
+                    transformedprefix += (isalnum(*pch) ? toupper(*pch) : '_');
+                    pch++;
+                }
+            }
+            for (vector<string>::const_iterator hdr = unsetHeaders.begin(); hdr!=unsetHeaders.end(); ++hdr) {
+                string transformed;
+                pch = hdr->c_str();
+                while (*pch) {
+                    transformed += (isalnum(*pch) ? toupper(*pch) : '_');
+                    pch++;
+                }
+                m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + *hdr, m_attributePrefix.second + transformed));
+                if (prefix.first)
+                    m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + prefix.second + *hdr, transformedprefix + transformed));
+            }
+        }
+        m_unsetHeaders.push_back(pair<string,string>(m_attributePrefix.first + "Shib-Application-ID", m_attributePrefix.second + "SHIB_APPLICATION_ID"));
+    }
+}
+#endif
+
+void XMLApplication::cleanup()
+{
+    ListenerService* listener=getServiceProvider().getListenerService(false);
+    if (listener && SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess) && !SPConfig::getConfig().isEnabled(SPConfig::InProcess)) {
+        string addr=string(getId()) + "::getHeaders::Application";
+        listener->unregListener(addr.c_str(),this);
+    }
+    for_each(m_handlers.begin(),m_handlers.end(),xmltooling::cleanup<Handler>());
+    m_handlers.clear();
+#ifndef SHIBSP_LITE
+    for_each(m_partyMap.begin(),m_partyMap.end(),cleanup_pair<xstring,PropertySet>());
+    m_partyMap.clear();
+    delete m_credResolver;
+    m_credResolver = nullptr;
+    delete m_attrResolver;
+    m_attrResolver = nullptr;
+    delete m_attrFilter;
+    m_attrFilter = nullptr;
+    delete m_attrExtractor;
+    m_attrExtractor = nullptr;
+    delete m_trust;
+    m_trust = nullptr;
+    delete m_metadata;
+    m_metadata = nullptr;
+#endif
+}
+
+#ifdef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+short
+#else
+DOMNodeFilter::FilterAction
+#endif
+XMLApplication::acceptNode(const DOMNode* node) const
+{
+    const XMLCh* name=node->getLocalName();
+    if (XMLString::equals(name,ApplicationOverride) ||
+        XMLString::equals(name,_Audience) ||
+        XMLString::equals(name,Notify) ||
+        XMLString::equals(name,_Handler) ||
+        XMLString::equals(name,_AssertionConsumerService) ||
+        XMLString::equals(name,_ArtifactResolutionService) ||
+        XMLString::equals(name,Logout) ||
+        XMLString::equals(name,_LogoutInitiator) ||
+        XMLString::equals(name,_ManageNameIDService) ||
+        XMLString::equals(name,NameIDMgmt) ||
+        XMLString::equals(name,_SessionInitiator) ||
+        XMLString::equals(name,_SingleLogoutService) ||
+        XMLString::equals(name,SSO) ||
+        XMLString::equals(name,RelyingParty) ||
+        XMLString::equals(name,_MetadataProvider) ||
+        XMLString::equals(name,_TrustEngine) ||
+        XMLString::equals(name,_CredentialResolver) ||
+        XMLString::equals(name,_AttributeFilter) ||
+        XMLString::equals(name,_AttributeExtractor) ||
+        XMLString::equals(name,_AttributeResolver))
+        return FILTER_REJECT;
+
+    return FILTER_ACCEPT;
+}
+
+#ifndef SHIBSP_LITE
+
+const PropertySet* XMLApplication::getRelyingParty(const EntityDescriptor* provider) const
+{
+    if (!provider)
+        return this;
+
+    map<xstring,PropertySet*>::const_iterator i=m_partyMap.find(provider->getEntityID());
+    if (i!=m_partyMap.end())
+        return i->second;
+    const EntitiesDescriptor* group=dynamic_cast<const EntitiesDescriptor*>(provider->getParent());
+    while (group) {
+        if (group->getName()) {
+            i=m_partyMap.find(group->getName());
+            if (i!=m_partyMap.end())
+                return i->second;
+        }
+        group=dynamic_cast<const EntitiesDescriptor*>(group->getParent());
+    }
+    return this;
+}
+
+const PropertySet* XMLApplication::getRelyingParty(const XMLCh* entityID) const
+{
+    if (!entityID)
+        return this;
+
+    map<xstring,PropertySet*>::const_iterator i=m_partyMap.find(entityID);
+    if (i!=m_partyMap.end())
+        return i->second;
+    return this;
+}
+
+#endif
+
+string XMLApplication::getNotificationURL(const char* resource, bool front, unsigned int index) const
+{
+    const vector<string>& locs = front ? m_frontLogout : m_backLogout;
+    if (locs.empty())
+        return m_base ? m_base->getNotificationURL(resource, front, index) : string();
+    else if (index >= locs.size())
+        return string();
+
+#ifdef HAVE_STRCASECMP
+    if (!resource || (strncasecmp(resource,"http://",7) && strncasecmp(resource,"https://",8)))
+#else
+    if (!resource || (strnicmp(resource,"http://",7) && strnicmp(resource,"https://",8)))
+#endif
+        throw ConfigurationException("Request URL was not absolute.");
+
+    const char* handler=locs[index].c_str();
+
+    // Should never happen...
+    if (!handler || (*handler!='/' && strncmp(handler,"http:",5) && strncmp(handler,"https:",6)))
+        throw ConfigurationException(
+            "Invalid Location property ($1) in Notify element for Application ($2)",
+            params(2, handler ? handler : "null", getId())
+            );
+
+    // The "Location" property can be in one of three formats:
+    //
+    // 1) a full URI:       http://host/foo/bar
+    // 2) a hostless URI:   http:///foo/bar
+    // 3) a relative path:  /foo/bar
+    //
+    // #  Protocol  Host        Path
+    // 1  handler   handler     handler
+    // 2  handler   resource    handler
+    // 3  resource  resource    handler
+
+    const char* path = nullptr;
+
+    // Decide whether to use the handler or the resource for the "protocol"
+    const char* prot;
+    if (*handler != '/') {
+        prot = handler;
+    }
+    else {
+        prot = resource;
+        path = handler;
+    }
+
+    // break apart the "protocol" string into protocol, host, and "the rest"
+    const char* colon=strchr(prot,':');
+    colon += 3;
+    const char* slash=strchr(colon,'/');
+    if (!path)
+        path = slash;
+
+    // Compute the actual protocol and store.
+    string notifyURL(prot, colon-prot);
+
+    // create the "host" from either the colon/slash or from the target string
+    // If prot == handler then we're in either #1 or #2, else #3.
+    // If slash == colon then we're in #2.
+    if (prot != handler || slash == colon) {
+        colon = strchr(resource, ':');
+        colon += 3;      // Get past the ://
+        slash = strchr(colon, '/');
+    }
+    string host(colon, (slash ? slash-colon : strlen(colon)));
+
+    // Build the URL
+    notifyURL += host + path;
+    return notifyURL;
+}
+
+void XMLApplication::clearHeader(SPRequest& request, const char* rawname, const char* cginame) const
+{
+    if (!m_attributePrefix.first.empty()) {
+        string temp = m_attributePrefix.first + rawname;
+        string temp2 = m_attributePrefix.second + (cginame + 5);
+        request.clearHeader(temp.c_str(), temp2.c_str());
+    }
+    else if (m_base) {
+        m_base->clearHeader(request, rawname, cginame);
+    }
+    else {
+        request.clearHeader(rawname, cginame);
+    }
+}
+
+void XMLApplication::setHeader(SPRequest& request, const char* name, const char* value) const
+{
+    if (!m_attributePrefix.first.empty()) {
+        string temp = m_attributePrefix.first + name;
+        request.setHeader(temp.c_str(), value);
+    }
+    else if (m_base) {
+        m_base->setHeader(request, name, value);
+    }
+    else {
+        request.setHeader(name, value);
+    }
+}
+
+string XMLApplication::getSecureHeader(const SPRequest& request, const char* name) const
+{
+    if (!m_attributePrefix.first.empty()) {
+        string temp = m_attributePrefix.first + name;
+        return request.getSecureHeader(temp.c_str());
+    }
+    else if (m_base) {
+        return m_base->getSecureHeader(request,name);
+    }
+    else {
+        return request.getSecureHeader(name);
+    }
+}
+
+const SessionInitiator* XMLApplication::getDefaultSessionInitiator() const
+{
+    if (m_sessionInitDefault) return m_sessionInitDefault;
+    return m_base ? m_base->getDefaultSessionInitiator() : nullptr;
+}
+
+const SessionInitiator* XMLApplication::getSessionInitiatorById(const char* id) const
+{
+    map<string,const SessionInitiator*>::const_iterator i=m_sessionInitMap.find(id);
+    if (i!=m_sessionInitMap.end()) return i->second;
+    return m_base ? m_base->getSessionInitiatorById(id) : nullptr;
+}
+
+const Handler* XMLApplication::getDefaultAssertionConsumerService() const
+{
+    if (m_acsDefault) return m_acsDefault;
+    return m_base ? m_base->getDefaultAssertionConsumerService() : nullptr;
+}
+
+const Handler* XMLApplication::getAssertionConsumerServiceByIndex(unsigned short index) const
+{
+    map<unsigned int,const Handler*>::const_iterator i=m_acsIndexMap.find(index);
+    if (i != m_acsIndexMap.end()) return i->second;
+    return m_base ? m_base->getAssertionConsumerServiceByIndex(index) : nullptr;
+}
+
+const Handler* XMLApplication::getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding) const
+{
+    ACSProtocolMap::const_iterator i=m_acsProtocolMap.find(protocol);
+    if (i != m_acsProtocolMap.end() && !i->second.empty()) {
+        if (!binding || !*binding)
+            return i->second.front();
+        for (ACSProtocolMap::value_type::second_type::const_iterator j = i->second.begin(); j != i->second.end(); ++j) {
+            if (!strcmp(binding, (*j)->getString("Binding").second))
+                return *j;
+        }
+    }
+    return m_base ? m_base->getAssertionConsumerServiceByProtocol(protocol) : nullptr;
+}
+
+const vector<const Handler*>& XMLApplication::getAssertionConsumerServicesByBinding(const XMLCh* binding) const
+{
+    ACSBindingMap::const_iterator i=m_acsBindingMap.find(binding);
+    if (i != m_acsBindingMap.end())
+        return i->second;
+    return m_base ? m_base->getAssertionConsumerServicesByBinding(binding) : g_noHandlers;
+}
+
+const Handler* XMLApplication::getHandler(const char* path) const
+{
+    string wrap(path);
+    wrap = wrap.substr(0,wrap.find(';'));
+    map<string,const Handler*>::const_iterator i=m_handlerMap.find(wrap.substr(0,wrap.find('?')));
+    if (i!=m_handlerMap.end())
+        return i->second;
+    return m_base ? m_base->getHandler(path) : nullptr;
+}
+
+void XMLApplication::getHandlers(vector<const Handler*>& handlers) const
+{
+    handlers.insert(handlers.end(), m_handlers.begin(), m_handlers.end());
+    if (m_base) {
+        for (map<string,const Handler*>::const_iterator h = m_base->m_handlerMap.begin(); h != m_base->m_handlerMap.end(); ++h) {
+            if (m_handlerMap.count(h->first) == 0)
+                handlers.push_back(h->second);
+        }
+    }
+}
+
+#ifdef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+short
+#else
+DOMNodeFilter::FilterAction
+#endif
+XMLConfigImpl::acceptNode(const DOMNode* node) const
+{
+    if (!XMLString::equals(node->getNamespaceURI(),shibspconstants::SHIB2SPCONFIG_NS))
+        return FILTER_ACCEPT;
+    const XMLCh* name=node->getLocalName();
+    if (XMLString::equals(name,ApplicationDefaults) ||
+        XMLString::equals(name,_ArtifactMap) ||
+        XMLString::equals(name,_Extensions) ||
+        XMLString::equals(name,Listener) ||
+        XMLString::equals(name,_ProtocolProvider) ||
+        XMLString::equals(name,_RequestMapper) ||
+        XMLString::equals(name,_ReplayCache) ||
+        XMLString::equals(name,SecurityPolicies) ||
+        XMLString::equals(name,_SecurityPolicyProvider) ||
+        XMLString::equals(name,_SessionCache) ||
+        XMLString::equals(name,Site) ||
+        XMLString::equals(name,_StorageService) ||
+        XMLString::equals(name,TCPListener) ||
+        XMLString::equals(name,TransportOption) ||
+        XMLString::equals(name,UnixListener))
+        return FILTER_REJECT;
+
+    return FILTER_ACCEPT;
+}
+
+void XMLConfigImpl::doExtensions(const DOMElement* e, const char* label, Category& log)
+{
+    const DOMElement* exts = XMLHelper::getFirstChildElement(e, _Extensions);
+    if (exts) {
+        exts = XMLHelper::getFirstChildElement(exts, Library);
+        while (exts) {
+            string path(XMLHelper::getAttrString(exts, nullptr, _path));
+            try {
+                if (!path.empty()) {
+                    if (!XMLToolingConfig::getConfig().load_library(path.c_str(), (void*)exts))
+                        throw ConfigurationException("XMLToolingConfig::load_library failed.");
+                    log.debug("loaded %s extension library (%s)", label, path.c_str());
+                }
+            }
+            catch (exception& e) {
+                if (XMLHelper::getAttrBool(exts, false, _fatal)) {
+                    log.fatal("unable to load mandatory %s extension library %s: %s", label, path.c_str(), e.what());
+                    throw;
+                }
+                else {
+                    log.crit("unable to load optional %s extension library %s: %s", label, path.c_str(), e.what());
+                }
+            }
+            exts = XMLHelper::getNextSiblingElement(exts, Library);
+        }
+    }
+}
+
+void XMLConfigImpl::doListener(const DOMElement* e, Category& log)
+{
+#ifdef WIN32
+    string plugtype(TCP_LISTENER_SERVICE);
+#else
+    string plugtype(UNIX_LISTENER_SERVICE);
+#endif
+    DOMElement* child = XMLHelper::getFirstChildElement(e, UnixListener);
+    if (child)
+        plugtype = UNIX_LISTENER_SERVICE;
+    else {
+        child = XMLHelper::getFirstChildElement(e, TCPListener);
+        if (child)
+            plugtype = TCP_LISTENER_SERVICE;
+        else {
+            child = XMLHelper::getFirstChildElement(e, Listener);
+            if (child) {
+                auto_ptr_char type(child->getAttributeNS(nullptr, _type));
+                if (type.get() && *type.get())
+                    plugtype = type.get();
+            }
+        }
+    }
+
+    log.info("building ListenerService of type %s...", plugtype.c_str());
+    m_outer->m_listener = SPConfig::getConfig().ListenerServiceManager.newPlugin(plugtype.c_str(), child);
+}
+
+void XMLConfigImpl::doCaching(const DOMElement* e, Category& log)
+{
+    SPConfig& conf = SPConfig::getConfig();
+#ifndef SHIBSP_LITE
+    SAMLConfig& samlConf = SAMLConfig::getConfig();
+#endif
+    XMLToolingConfig& xmlConf = XMLToolingConfig::getConfig();
+
+    DOMElement* child;
+#ifndef SHIBSP_LITE
+    if (conf.isEnabled(SPConfig::OutOfProcess)) {
+        // First build any StorageServices.
+        child = XMLHelper::getFirstChildElement(e, _StorageService);
+        while (child) {
+            string id(XMLHelper::getAttrString(child, nullptr, _id));
+            string t(XMLHelper::getAttrString(child, nullptr, _type));
+            if (!t.empty()) {
+                try {
+                    log.info("building StorageService (%s) of type %s...", id.c_str(), t.c_str());
+                    m_outer->m_storage[id] = xmlConf.StorageServiceManager.newPlugin(t.c_str(), child);
+                }
+                catch (exception& ex) {
+                    log.crit("failed to instantiate StorageService (%s): %s", id.c_str(), ex.what());
+                }
+            }
+            child = XMLHelper::getNextSiblingElement(child, _StorageService);
+        }
+
+        if (m_outer->m_storage.empty()) {
+            log.info("no StorageService plugin(s) installed, using (mem) in-memory instance");
+            m_outer->m_storage["id"] = xmlConf.StorageServiceManager.newPlugin(MEMORY_STORAGE_SERVICE, nullptr);
+        }
+
+        // Replay cache.
+        StorageService* replaySS = nullptr;
+        child = XMLHelper::getFirstChildElement(e, _ReplayCache);
+        if (child) {
+            string ssid(XMLHelper::getAttrString(child, nullptr, _StorageService));
+            if (!ssid.empty()) {
+                if (m_outer->m_storage.count(ssid)) {
+                    log.info("building ReplayCache on top of StorageService (%s)...", ssid.c_str());
+                    replaySS = m_outer->m_storage[ssid];
+                }
+                else {
+                    log.error("unable to locate StorageService (%s), using arbitrary instance for ReplayCache", ssid.c_str());
+                    replaySS = m_outer->m_storage.begin()->second;
+                }
+            }
+            else {
+                log.info("no StorageService specified for ReplayCache, using arbitrary instance");
+                replaySS = m_outer->m_storage.begin()->second;
+            }
+        }
+        else {
+            log.info("no ReplayCache specified, using arbitrary StorageService instance");
+            replaySS = m_outer->m_storage.begin()->second;
+        }
+        xmlConf.setReplayCache(new ReplayCache(replaySS));
+
+        // ArtifactMap
+        child = XMLHelper::getFirstChildElement(e, _ArtifactMap);
+        if (child) {
+            string ssid(XMLHelper::getAttrString(child, nullptr, _StorageService));
+            if (!ssid.empty()) {
+                if (m_outer->m_storage.count(ssid)) {
+                    log.info("building ArtifactMap on top of StorageService (%s)...", ssid.c_str());
+                    samlConf.setArtifactMap(new ArtifactMap(child, m_outer->m_storage[ssid]));
+                }
+                else {
+                    log.error("unable to locate StorageService (%s), using in-memory ArtifactMap", ssid.c_str());
+                    samlConf.setArtifactMap(new ArtifactMap(child));
+                }
+            }
+            else {
+                log.info("no StorageService specified, using in-memory ArtifactMap");
+                samlConf.setArtifactMap(new ArtifactMap(child));
+            }
+        }
+        else {
+            log.info("no ArtifactMap specified, building in-memory ArtifactMap...");
+            samlConf.setArtifactMap(new ArtifactMap(child));
+        }
+    }   // end of out of process caching components
+#endif
+
+    child = XMLHelper::getFirstChildElement(e, _SessionCache);
+    if (child) {
+        string t(XMLHelper::getAttrString(child, nullptr, _type));
+        if (!t.empty()) {
+            log.info("building SessionCache of type %s...", t.c_str());
+            m_outer->m_sessionCache = conf.SessionCacheManager.newPlugin(t.c_str(), child);
+        }
+    }
+    if (!m_outer->m_sessionCache) {
+        log.info("no SessionCache specified, using StorageService-backed instance");
+        m_outer->m_sessionCache = conf.SessionCacheManager.newPlugin(STORAGESERVICE_SESSION_CACHE, nullptr);
+    }
+}
+
+XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* outer, Category& log)
+    : m_requestMapper(nullptr),
+#ifndef SHIBSP_LITE
+        m_policy(nullptr),
+#endif
+        m_outer(outer), m_document(nullptr)
+{
+#ifdef _DEBUG
+    xmltooling::NDC ndc("XMLConfigImpl");
+#endif
+
+    try {
+        SPConfig& conf=SPConfig::getConfig();
+#ifndef SHIBSP_LITE
+        SAMLConfig& samlConf=SAMLConfig::getConfig();
+#endif
+        XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();
+        const DOMElement* SHAR=XMLHelper::getFirstChildElement(e, OutOfProcess);
+        const DOMElement* SHIRE=XMLHelper::getFirstChildElement(e, InProcess);
+
+        // Initialize logging manually in order to redirect log messages as soon as possible.
+        if (conf.isEnabled(SPConfig::Logging)) {
+            string logconf;
+            if (conf.isEnabled(SPConfig::OutOfProcess))
+                logconf = XMLHelper::getAttrString(SHAR, nullptr, logger);
+            else if (conf.isEnabled(SPConfig::InProcess))
+                logconf = XMLHelper::getAttrString(SHIRE, nullptr, logger);
+            if (logconf.empty())
+                logconf = XMLHelper::getAttrString(e, nullptr, logger);
+            if (logconf.empty() && !getenv("SHIBSP_LOGGING")) {
+                // No properties found, so default them.
+                if (conf.isEnabled(SPConfig::OutOfProcess) && !conf.isEnabled(SPConfig::InProcess))
+                    logconf = "shibd.logger";
+                else if (!conf.isEnabled(SPConfig::OutOfProcess) && conf.isEnabled(SPConfig::InProcess))
+                    logconf = "native.logger";
+                else
+                    logconf = "shibboleth.logger";
+            }
+            if (!logconf.empty()) {
+                log.debug("loading new logging configuration from (%s), check log destination for status of configuration", logconf.c_str());
+                if (!XMLToolingConfig::getConfig().log_config(logconf.c_str()))
+                    log.crit("failed to load new logging configuration from (%s)", logconf.c_str());
+            }
+
+#ifndef SHIBSP_LITE
+            if (first)
+                m_outer->m_tranLog = new TransactionLog();
+#endif
+        }
+
+        // Re-log library versions now that logging is set up.
+        log.info("Shibboleth SP Version %s", PACKAGE_VERSION);
+#ifndef SHIBSP_LITE
+        log.info(
+            "Library versions: Xerces-C %s, XML-Security-C %s, XMLTooling-C %s, OpenSAML-C %s, Shibboleth %s",
+            XERCES_FULLVERSIONDOT, XSEC_FULLVERSIONDOT, XMLTOOLING_FULLVERSIONDOT, OPENSAML_FULLVERSIONDOT, SHIBSP_FULLVERSIONDOT
+            );
+#else
+        log.info(
+            "Library versions: Xerces-C %s, XMLTooling-C %s, Shibboleth %s",
+            XERCES_FULLVERSIONDOT, XMLTOOLING_FULLVERSIONDOT, SHIBSP_FULLVERSIONDOT
+            );
+#endif
+
+        // First load any property sets.
+        load(e,nullptr,this);
+
+        DOMElement* child;
+
+        // Much of the processing can only occur on the first instantiation.
+        if (first) {
+            // Set clock skew.
+            pair<bool,unsigned int> skew=getUnsignedInt("clockSkew");
+            if (skew.first)
+                xmlConf.clock_skew_secs=min(skew.second,(60*60*24*7*28));
+
+            pair<bool,const char*> unsafe = getString("unsafeChars");
+            if (unsafe.first)
+                TemplateEngine::unsafe_chars = unsafe.second;
+
+            unsafe = getString("allowedSchemes");
+            if (unsafe.first) {
+                HTTPResponse::getAllowedSchemes().clear();
+                string schemes=unsafe.second;
+                unsigned int j_sch=0;
+                for (unsigned int i_sch=0;  i_sch < schemes.length();  i_sch++) {
+                    if (schemes.at(i_sch)==' ') {
+                        HTTPResponse::getAllowedSchemes().push_back(schemes.substr(j_sch, i_sch-j_sch));
+                        j_sch = i_sch + 1;
+                    }
+                }
+                HTTPResponse::getAllowedSchemes().push_back(schemes.substr(j_sch, schemes.length()-j_sch));
+            }
+
+            // Extensions
+            doExtensions(e, "global", log);
+            if (conf.isEnabled(SPConfig::OutOfProcess))
+                doExtensions(SHAR, "out of process", log);
+
+            if (conf.isEnabled(SPConfig::InProcess))
+                doExtensions(SHIRE, "in process", log);
+
+            // Instantiate the ListenerService and SessionCache objects.
+            if (conf.isEnabled(SPConfig::Listener))
+                doListener(e, log);
+
+#ifndef SHIBSP_LITE
+            if (m_outer->m_listener && conf.isEnabled(SPConfig::OutOfProcess) && !conf.isEnabled(SPConfig::InProcess)) {
+                m_outer->m_listener->regListener("set::RelayState", const_cast<XMLConfig*>(m_outer));
+                m_outer->m_listener->regListener("get::RelayState", const_cast<XMLConfig*>(m_outer));
+                m_outer->m_listener->regListener("set::PostData", const_cast<XMLConfig*>(m_outer));
+                m_outer->m_listener->regListener("get::PostData", const_cast<XMLConfig*>(m_outer));
+            }
+#endif
+            if (conf.isEnabled(SPConfig::Caching))
+                doCaching(e, log);
+        } // end of first-time-only stuff
+
+        // Back to the fully dynamic stuff...next up is the RequestMapper.
+        if (conf.isEnabled(SPConfig::RequestMapping)) {
+            if (child = XMLHelper::getFirstChildElement(e, _RequestMapper)) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                if (!t.empty()) {
+                    log.info("building RequestMapper of type %s...", t.c_str());
+                    m_requestMapper = conf.RequestMapperManager.newPlugin(t.c_str(), child);
+                }
+            }
+            if (!m_requestMapper) {
+                log.info("no RequestMapper specified, using 'Native' plugin with empty/default map");
+                child = e->getOwnerDocument()->createElementNS(nullptr, _RequestMapper);
+                DOMElement* mapperDummy = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS, RequestMap);
+                mapperDummy->setAttributeNS(nullptr, applicationId, _default);
+                child->appendChild(mapperDummy);
+                m_requestMapper = conf.RequestMapperManager.newPlugin(NATIVE_REQUEST_MAPPER, child);
+            }
+        }
+
+#ifndef SHIBSP_LITE
+        // Load security policies.
+        if (child = XMLHelper::getLastChildElement(e, _SecurityPolicyProvider)) {
+            string t(XMLHelper::getAttrString(child, nullptr, _type));
+            if (!t.empty()) {
+                log.info("building SecurityPolicyProvider of type %s...", t.c_str());
+                m_policy = conf.SecurityPolicyProviderManager.newPlugin(t.c_str(), child);
+            }
+            else {
+                throw ConfigurationException("can't build SecurityPolicyProvider, no type specified");
+            }
+        }
+        else if (child = XMLHelper::getLastChildElement(e, SecurityPolicies)) {
+            // For backward compatibility, wrap in a plugin element.
+            DOMElement* polwrapper = e->getOwnerDocument()->createElementNS(nullptr, _SecurityPolicyProvider);
+            polwrapper->appendChild(child);
+            log.info("building SecurityPolicyProvider of type %s...", XML_SECURITYPOLICY_PROVIDER);
+            m_policy = conf.SecurityPolicyProviderManager.newPlugin(XML_SECURITYPOLICY_PROVIDER, polwrapper);
+        }
+        else {
+            log.fatal("can't build SecurityPolicyProvider, missing conf:SecurityPolicyProvider element?");
+            throw ConfigurationException("Can't build SecurityPolicyProvider, missing conf:SecurityPolicyProvider element?");
+        }
+
+        if (first) {
+#ifdef SHIBSP_XMLSEC_WHITELISTING
+            vector<xstring>::const_iterator alg;
+            if (!m_policy->getAlgorithmBlacklist().empty()) {
+                for (alg = m_policy->getAlgorithmBlacklist().begin(); alg != m_policy->getAlgorithmBlacklist().end(); ++alg)
+                    XSECPlatformUtils::blacklistAlgorithm(alg->c_str());
+            }
+            else if (!m_policy->getAlgorithmWhitelist().empty()) {
+                for (alg = m_policy->getAlgorithmWhitelist().begin(); alg != m_policy->getAlgorithmWhitelist().end(); ++alg)
+                    XSECPlatformUtils::whitelistAlgorithm(alg->c_str());
+            }
+#else
+            log.fatal("XML-Security-C library prior to 1.6.0 does not support algorithm white/blacklists");
+            throw ConfigurationException("XML-Security-C library prior to 1.6.0 does not support algorithm white/blacklists.");
+#endif
+        }
+
+        // Process TransportOption elements.
+        child = XMLHelper::getLastChildElement(e, TransportOption);
+        while (child) {
+            if (child->hasChildNodes()) {
+                string provider(XMLHelper::getAttrString(child, nullptr, _provider));
+                string option(XMLHelper::getAttrString(child, nullptr, _option));
+                auto_ptr_char value(child->getFirstChild()->getNodeValue());
+                if (!provider.empty() && !option.empty() && value.get() && *value.get()) {
+                    m_transportOptions.push_back(make_pair(provider, make_pair(option, string(value.get()))));
+                }
+            }
+            child = XMLHelper::getPreviousSiblingElement(child, TransportOption);
+        }
+#endif
+
+        ProtocolProvider* pp = nullptr;
+        if (conf.isEnabled(SPConfig::Handlers)) {
+            if (child = XMLHelper::getLastChildElement(e, _ProtocolProvider)) {
+                string t(XMLHelper::getAttrString(child, nullptr, _type));
+                if (!t.empty()) {
+                    log.info("building ProtocolProvider of type %s...", t.c_str());
+                    pp = conf.ProtocolProviderManager.newPlugin(t.c_str(), child);
+                }
+            }
+        }
+        auto_ptr<ProtocolProvider> ppwrapper(pp);
+        Locker pplocker(pp);
+
+        // Load the default application.
+        child = XMLHelper::getLastChildElement(e, ApplicationDefaults);
+        if (!child) {
+            log.fatal("can't build default Application object, missing conf:ApplicationDefaults element?");
+            throw ConfigurationException("can't build default Application object, missing conf:ApplicationDefaults element?");
+        }
+        XMLApplication* defapp = new XMLApplication(m_outer, pp, child);
+        m_appmap[defapp->getId()] = defapp;
+
+        // Load any overrides.
+        child = XMLHelper::getFirstChildElement(child, ApplicationOverride);
+        while (child) {
+            auto_ptr<XMLApplication> iapp(new XMLApplication(m_outer, pp, child, defapp));
+            if (m_appmap.count(iapp->getId()))
+                log.crit("found conf:ApplicationOverride element with duplicate id attribute (%s), skipping it", iapp->getId());
+            else {
+                const char* iappid=iapp->getId();
+                m_appmap[iappid] = iapp.release();
+            }
+
+            child = XMLHelper::getNextSiblingElement(child, ApplicationOverride);
+        }
+    }
+    catch (exception&) {
+        cleanup();
+        throw;
+    }
+}
+
+XMLConfigImpl::~XMLConfigImpl()
+{
+    cleanup();
+}
+
+void XMLConfigImpl::cleanup()
+{
+    for_each(m_appmap.begin(),m_appmap.end(),cleanup_pair<string,Application>());
+    m_appmap.clear();
+#ifndef SHIBSP_LITE
+    delete m_policy;
+    m_policy = nullptr;
+#endif
+    delete m_requestMapper;
+    m_requestMapper = nullptr;
+    if (m_document)
+        m_document->release();
+    m_document = nullptr;
+}
+
+#ifndef SHIBSP_LITE
+void XMLConfig::receive(DDF& in, ostream& out)
+{
+    if (!strcmp(in.name(), "get::RelayState")) {
+        const char* id = in["id"].string();
+        const char* key = in["key"].string();
+        if (!id || !key)
+            throw ListenerException("Required parameters missing for RelayState recovery.");
+
+        string relayState;
+        StorageService* storage = getStorageService(id);
+        if (storage) {
+            if (storage->readString("RelayState",key,&relayState)>0) {
+                if (in["clear"].integer())
+                    storage->deleteString("RelayState",key);
+            }
+        }
+        else {
+            Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+                "Storage-backed RelayState with invalid StorageService ID (%s)", id
+                );
+        }
+
+        // Repack for return to caller.
+        DDF ret=DDF(nullptr).unsafe_string(relayState.c_str());
+        DDFJanitor jret(ret);
+        out << ret;
+    }
+    else if (!strcmp(in.name(), "set::RelayState")) {
+        const char* id = in["id"].string();
+        const char* value = in["value"].string();
+        if (!id || !value)
+            throw ListenerException("Required parameters missing for RelayState creation.");
+
+        string rsKey;
+        StorageService* storage = getStorageService(id);
+        if (storage) {
+            SAMLConfig::getConfig().generateRandomBytes(rsKey,20);
+            rsKey = SAMLArtifact::toHex(rsKey);
+            storage->createString("RelayState", rsKey.c_str(), value, time(nullptr) + 600);
+        }
+        else {
+            Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+                "Storage-backed RelayState with invalid StorageService ID (%s)", id
+                );
+        }
+
+        // Repack for return to caller.
+        DDF ret=DDF(nullptr).string(rsKey.c_str());
+        DDFJanitor jret(ret);
+        out << ret;
+    }
+    else if (!strcmp(in.name(), "get::PostData")) {
+        const char* id = in["id"].string();
+        const char* key = in["key"].string();
+        if (!id || !key)
+            throw ListenerException("Required parameters missing for PostData recovery.");
+
+        string postData;
+        StorageService* storage = getStorageService(id);
+        if (storage) {
+            if (storage->readString("PostData",key,&postData) > 0) {
+                storage->deleteString("PostData",key);
+            }
+        }
+        else {
+            Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+                "Storage-backed PostData with invalid StorageService ID (%s)", id
+                );
+        }
+        // If the data's empty, we'll send nothing back.
+        // If not, we don't need to round trip it, just send back the serialized DDF list.
+        if (postData.empty()) {
+            DDF ret(nullptr);
+            DDFJanitor jret(ret);
+            out << ret;
+        }
+        else {
+            out << postData;
+        }
+    }
+    else if (!strcmp(in.name(), "set::PostData")) {
+        const char* id = in["id"].string();
+        if (!id || !in["parameters"].islist())
+            throw ListenerException("Required parameters missing for PostData creation.");
+
+        string rsKey;
+        StorageService* storage = getStorageService(id);
+        if (storage) {
+            SAMLConfig::getConfig().generateRandomBytes(rsKey,20);
+            rsKey = SAMLArtifact::toHex(rsKey);
+            ostringstream params;
+            params << in["parameters"];
+            storage->createString("PostData", rsKey.c_str(), params.str().c_str(), time(nullptr) + 600);
+        }
+        else {
+            Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+                "Storage-backed PostData with invalid StorageService ID (%s)", id
+                );
+        }
+
+        // Repack for return to caller.
+        DDF ret=DDF(nullptr).string(rsKey.c_str());
+        DDFJanitor jret(ret);
+        out << ret;
+    }
+}
+#endif
+
+pair<bool,DOMElement*> XMLConfig::background_load()
+{
+    // Load from source using base class.
+    pair<bool,DOMElement*> raw = ReloadableXMLFile::load();
+
+    // If we own it, wrap it.
+    XercesJanitor<DOMDocument> docjanitor(raw.first ? raw.second->getOwnerDocument() : nullptr);
+
+    XMLConfigImpl* impl = new XMLConfigImpl(raw.second, (m_impl==nullptr), this, m_log);
+
+    // If we held the document, transfer it to the impl. If we didn't, it's a no-op.
+    impl->setDocument(docjanitor.release());
+
+    // Perform the swap inside a lock.
+    if (m_lock)
+        m_lock->wrlock();
+    SharedLock locker(m_lock, false);
+    delete m_impl;
+    m_impl = impl;
+
+    return make_pair(false,(DOMElement*)nullptr);
+}