From c51bfd77603cf0ddb0b5e374c35586a8435895d6 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 23 Jan 2015 01:12:10 +0000 Subject: [PATCH] SSPCPP-616 - clean up concatenated string literals --- adfs/adfs.cpp | 10 ++++----- apache/mod_shib.cpp | 2 +- fastcgi/shibauthorizer.cpp | 2 +- fastcgi/shibresponder.cpp | 2 +- isapi_shib/isapi_shib.cpp | 4 ++-- nsapi_shib/nsapi_shib.cpp | 2 +- plugins/CaseFoldingAttributeResolver.cpp | 2 +- plugins/GSSAPIAttributeExtractor.cpp | 2 +- plugins/TemplateAttributeResolver.cpp | 2 +- plugins/TransformAttributeResolver.cpp | 2 +- shibsp/SPConfig.cpp | 10 ++++----- shibsp/ServiceProvider.cpp | 12 +++++----- shibsp/attribute/Base64AttributeDecoder.cpp | 2 +- shibsp/attribute/DOMAttributeDecoder.cpp | 4 ++-- shibsp/attribute/KeyInfoAttributeDecoder.cpp | 2 +- shibsp/attribute/NameIDAttribute.cpp | 2 +- shibsp/attribute/NameIDAttributeDecoder.cpp | 2 +- .../attribute/NameIDFromScopedAttributeDecoder.cpp | 2 +- shibsp/attribute/ScopedAttributeDecoder.cpp | 2 +- shibsp/attribute/StringAttributeDecoder.cpp | 2 +- shibsp/attribute/XMLAttributeDecoder.cpp | 2 +- .../filtering/impl/AttributeValueStringFunctor.cpp | 2 +- .../filtering/impl/ChainingAttributeFilter.cpp | 2 +- .../filtering/impl/DummyAttributeFilter.cpp | 2 +- .../impl/NameIDQualifierStringFunctor.cpp | 14 ++++++------ .../filtering/impl/XMLAttributeFilter.cpp | 2 +- .../resolver/impl/ChainingAttributeExtractor.cpp | 4 ++-- .../resolver/impl/ChainingAttributeResolver.cpp | 6 ++--- .../resolver/impl/DelegationAttributeExtractor.cpp | 2 +- .../resolver/impl/QueryAttributeResolver.cpp | 2 +- .../impl/SimpleAggregationAttributeResolver.cpp | 2 +- .../resolver/impl/XMLAttributeExtractor.cpp | 2 +- shibsp/binding/impl/ArtifactResolver.cpp | 4 ++-- shibsp/binding/impl/SOAPClient.cpp | 6 ++--- shibsp/binding/impl/XMLProtocolProvider.cpp | 2 +- shibsp/handler/impl/AbstractHandler.cpp | 2 +- shibsp/handler/impl/AssertionLookup.cpp | 2 +- shibsp/handler/impl/AttributeCheckerHandler.cpp | 2 +- shibsp/handler/impl/ChainingLogoutInitiator.cpp | 2 +- shibsp/handler/impl/ChainingSessionInitiator.cpp | 2 +- shibsp/handler/impl/CookieSessionInitiator.cpp | 2 +- shibsp/handler/impl/DiscoveryFeed.cpp | 2 +- shibsp/handler/impl/ExternalAuthHandler.cpp | 2 +- shibsp/handler/impl/FormSessionInitiator.cpp | 2 +- shibsp/handler/impl/LocalLogoutInitiator.cpp | 2 +- shibsp/handler/impl/LogoutHandler.cpp | 10 ++++----- shibsp/handler/impl/MetadataGenerator.cpp | 2 +- shibsp/handler/impl/RemotedHandler.cpp | 6 ++--- shibsp/handler/impl/SAML1Consumer.cpp | 2 +- shibsp/handler/impl/SAML2ArtifactResolution.cpp | 2 +- shibsp/handler/impl/SAML2Consumer.cpp | 2 +- shibsp/handler/impl/SAML2Logout.cpp | 2 +- shibsp/handler/impl/SAML2LogoutInitiator.cpp | 2 +- shibsp/handler/impl/SAML2NameIDMgmt.cpp | 2 +- shibsp/handler/impl/SAML2SessionInitiator.cpp | 2 +- shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 2 +- shibsp/handler/impl/SessionHandler.cpp | 2 +- shibsp/handler/impl/SessionInitiator.cpp | 4 ++-- shibsp/handler/impl/Shib1SessionInitiator.cpp | 2 +- shibsp/handler/impl/StatusHandler.cpp | 2 +- shibsp/handler/impl/TransformSessionInitiator.cpp | 2 +- shibsp/handler/impl/WAYFSessionInitiator.cpp | 2 +- shibsp/impl/ChainingAccessControl.cpp | 2 +- shibsp/impl/StorageServiceSessionCache.cpp | 26 +++++++++++----------- shibsp/impl/XMLAccessControl.cpp | 2 +- shibsp/impl/XMLRequestMapper.cpp | 2 +- shibsp/impl/XMLSecurityPolicyProvider.cpp | 2 +- shibsp/impl/XMLServiceProvider.cpp | 14 ++++++------ shibsp/metadata/DynamicMetadataProvider.cpp | 2 +- shibsp/remoting/impl/ListenerService.cpp | 4 ++-- shibsp/remoting/impl/SocketListener.cpp | 4 ++-- shibsp/util/DOMPropertySet.cpp | 2 +- shibsp/util/IPRange.cpp | 2 +- util/mdquery.cpp | 2 +- util/resolvertest.cpp | 4 ++-- 75 files changed, 130 insertions(+), 130 deletions(-) diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp index f1191be..7e6d20d 100644 --- a/adfs/adfs.cpp +++ b/adfs/adfs.cpp @@ -124,7 +124,7 @@ namespace { { public: ADFSSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.ADFS"), nullptr, &m_remapper), m_appId(appId), m_binding(WSFED_NS) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.ADFS"), nullptr, &m_remapper), m_appId(appId), m_binding(WSFED_NS) { // If Location isn't set, defer address registration until the setParent call. pair loc = getString("Location"); if (loc.first) { @@ -179,7 +179,7 @@ namespace { auto_ptr_XMLCh m_protocol; public: ADFSConsumer(const DOMElement* e, const char* appId) - : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".SSO.ADFS")), m_protocol(WSFED_NS) {} + : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT ".SSO.ADFS")), m_protocol(WSFED_NS) {} virtual ~ADFSConsumer() {} #ifndef SHIBSP_LITE @@ -208,7 +208,7 @@ namespace { { public: ADFSLogoutInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".LogoutInitiator.ADFS")), m_appId(appId), m_binding(WSFED_NS) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".LogoutInitiator.ADFS")), m_appId(appId), m_binding(WSFED_NS) { // If Location isn't set, defer address registration until the setParent call. pair loc = getString("Location"); if (loc.first) { @@ -248,7 +248,7 @@ namespace { { public: ADFSLogout(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".Logout.ADFS")), m_login(e, appId) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".Logout.ADFS")), m_login(e, appId) { m_initiator = false; #ifndef SHIBSP_LITE m_preserve.push_back("wreply"); @@ -566,7 +566,7 @@ XMLObject* ADFSDecoder::decode(string& relayState, const GenericRequest& generic #ifdef _DEBUG xmltooling::NDC ndc("decode"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".MessageDecoder.ADFS"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".MessageDecoder.ADFS"); log.debug("validating input"); const HTTPRequest* httpRequest=dynamic_cast(&genericRequest); diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp index edf99e1..5652713 100644 --- a/apache/mod_shib.cpp +++ b/apache/mod_shib.cpp @@ -345,7 +345,7 @@ public: shib_server_config* m_sc; shib_request_config* m_rc; - ShibTargetApache(request_rec* req) : AbstractSPRequest(SHIBSP_LOGCAT".Apache"), + ShibTargetApache(request_rec* req) : AbstractSPRequest(SHIBSP_LOGCAT ".Apache"), m_gotBody(false),m_firsttime(true), #if defined(SHIBSP_HAVE_GSSAPI) && !defined(SHIB_APACHE_13) m_gssname(GSS_C_NO_NAME), diff --git a/fastcgi/shibauthorizer.cpp b/fastcgi/shibauthorizer.cpp index 75d3185..76d4a27 100644 --- a/fastcgi/shibauthorizer.cpp +++ b/fastcgi/shibauthorizer.cpp @@ -72,7 +72,7 @@ public: map m_request_headers; ShibTargetFCGIAuth(FCGX_Request* req, const char* scheme=nullptr, const char* hostname=nullptr, int port=0) - : AbstractSPRequest(SHIBSP_LOGCAT".FastCGI"), m_req(req) { + : AbstractSPRequest(SHIBSP_LOGCAT ".FastCGI"), m_req(req) { const char* server_name_str = hostname; if (!server_name_str || !*server_name_str) server_name_str = FCGX_GetParam("SERVER_NAME", req->envp); diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp index 9f63a2f..32afe8e 100644 --- a/fastcgi/shibresponder.cpp +++ b/fastcgi/shibresponder.cpp @@ -72,7 +72,7 @@ class ShibTargetFCGI : public AbstractSPRequest public: ShibTargetFCGI(FCGX_Request* req, char* post_data, const char* scheme=nullptr, const char* hostname=nullptr, int port=0) - : AbstractSPRequest(SHIBSP_LOGCAT".FastCGI"), m_req(req), m_body(post_data) { + : AbstractSPRequest(SHIBSP_LOGCAT ".FastCGI"), m_req(req), m_body(post_data) { const char* server_name_str = hostname; if (!server_name_str || !*server_name_str) diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp index f7bded1..3872b3c 100644 --- a/isapi_shib/isapi_shib.cpp +++ b/isapi_shib/isapi_shib.cpp @@ -333,7 +333,7 @@ class ShibTargetIsapiF : public AbstractSPRequest public: ShibTargetIsapiF(PHTTP_FILTER_CONTEXT pfc, PHTTP_FILTER_PREPROC_HEADERS pn, const site_t& site) - : AbstractSPRequest(SHIBSP_LOGCAT".ISAPI"), m_pfc(pfc), m_pn(pn), m_allhttp(4096), m_firsttime(true) { + : AbstractSPRequest(SHIBSP_LOGCAT ".ISAPI"), m_pfc(pfc), m_pn(pn), m_allhttp(4096), m_firsttime(true) { // URL path always come from IIS. dynabuf var(256); @@ -724,7 +724,7 @@ class ShibTargetIsapiE : public AbstractSPRequest public: ShibTargetIsapiE(LPEXTENSION_CONTROL_BLOCK lpECB, const site_t& site) - : AbstractSPRequest(SHIBSP_LOGCAT".ISAPI"), m_lpECB(lpECB), m_gotBody(false) { + : AbstractSPRequest(SHIBSP_LOGCAT ".ISAPI"), m_lpECB(lpECB), m_gotBody(false) { dynabuf ssl(5); GetServerVariable("HTTPS",ssl,5); bool SSL=(ssl=="on" || ssl=="ON"); diff --git a/nsapi_shib/nsapi_shib.cpp b/nsapi_shib/nsapi_shib.cpp index 4b0c678..bbceda7 100644 --- a/nsapi_shib/nsapi_shib.cpp +++ b/nsapi_shib/nsapi_shib.cpp @@ -227,7 +227,7 @@ public: Request* m_rq; ShibTargetNSAPI(pblock* pb, ::Session* sn, Request* rq) - : AbstractSPRequest(SHIBSP_LOGCAT".NSAPI"), + : AbstractSPRequest(SHIBSP_LOGCAT ".NSAPI"), m_gotBody(false), m_firsttime(true), m_security_active(false), m_server_portnum(0), m_pb(pb), m_sn(sn), m_rq(rq) { // To determine whether SSL is active or not, we're supposed to rely diff --git a/plugins/CaseFoldingAttributeResolver.cpp b/plugins/CaseFoldingAttributeResolver.cpp index 34ded99..e3e03a9 100644 --- a/plugins/CaseFoldingAttributeResolver.cpp +++ b/plugins/CaseFoldingAttributeResolver.cpp @@ -150,7 +150,7 @@ namespace shibsp { vector FoldingContext::m_assertions; CaseFoldingAttributeResolver::CaseFoldingAttributeResolver(const DOMElement* e, case_t direction) - : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver.CaseFolding")), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.CaseFolding")), m_direction(direction), m_source(XMLHelper::getAttrString(e, nullptr, source)), m_dest(1, XMLHelper::getAttrString(e, nullptr, dest)) diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp index 4c1f9be..a405eae 100644 --- a/plugins/GSSAPIAttributeExtractor.cpp +++ b/plugins/GSSAPIAttributeExtractor.cpp @@ -111,7 +111,7 @@ namespace shibsp { { public: GSSAPIExtractor(const DOMElement* e) - : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.GSSAPI")) { + : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.GSSAPI")) { background_load(); } ~GSSAPIExtractor() { diff --git a/plugins/TemplateAttributeResolver.cpp b/plugins/TemplateAttributeResolver.cpp index 2baeb6f..cb9f828 100644 --- a/plugins/TemplateAttributeResolver.cpp +++ b/plugins/TemplateAttributeResolver.cpp @@ -143,7 +143,7 @@ namespace shibsp { vector TemplateContext::m_assertions; TemplateAttributeResolver::TemplateAttributeResolver(const DOMElement* e) - : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver.Template")), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.Template")), m_dest(1, XMLHelper::getAttrString(e, nullptr, dest)) { if (m_dest.front().empty()) diff --git a/plugins/TransformAttributeResolver.cpp b/plugins/TransformAttributeResolver.cpp index e036748..21a0246 100644 --- a/plugins/TransformAttributeResolver.cpp +++ b/plugins/TransformAttributeResolver.cpp @@ -152,7 +152,7 @@ namespace shibsp { vector TransformContext::m_assertions; TransformAttributeResolver::TransformAttributeResolver(const DOMElement* e) - : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver.Transform")), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.Transform")), m_source(XMLHelper::getAttrString(e, nullptr, source)) { if (m_source.empty()) diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp index 695763a..e8b6d2f 100644 --- a/shibsp/SPConfig.cpp +++ b/shibsp/SPConfig.cpp @@ -201,7 +201,7 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix) std::string lc(logconf); XMLToolingConfig::getConfig().log_config(localpr.resolve(lc, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME).c_str()); - Category& log=Category::getInstance(SHIBSP_LOGCAT".Config"); + Category& log=Category::getInstance(SHIBSP_LOGCAT ".Config"); log.debug("%s library initialization started", PACKAGE_STRING); #ifndef SHIBSP_LITE @@ -341,7 +341,7 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix) void SPConfig::term() { - Category& log=Category::getInstance(SHIBSP_LOGCAT".Config"); + Category& log=Category::getInstance(SHIBSP_LOGCAT ".Config"); log.info("%s library shutting down", PACKAGE_STRING); setServiceProvider(nullptr); @@ -450,7 +450,7 @@ bool SPConfig::instantiate(const char* config, bool rethrow) catch (exception& ex) { if (rethrow) throw; - Category::getInstance(SHIBSP_LOGCAT".Config").fatal("caught exception while loading configuration: %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".Config").fatal("caught exception while loading configuration: %s", ex.what()); } return false; } @@ -464,7 +464,7 @@ bool SPInternalConfig::init(const char* catalog_path, const char* inst_prefix) Lock initLock(m_lock); if (m_initCount == INT_MAX) { - Category::getInstance(SHIBSP_LOGCAT".Config").crit("library initialized too many times"); + Category::getInstance(SHIBSP_LOGCAT ".Config").crit("library initialized too many times"); return false; } @@ -489,7 +489,7 @@ void SPInternalConfig::term() Lock initLock(m_lock); if (m_initCount == 0) { - Category::getInstance(SHIBSP_LOGCAT".Config").crit("term without corresponding init"); + Category::getInstance(SHIBSP_LOGCAT ".Config").crit("term without corresponding init"); return; } else if (--m_initCount > 0) { diff --git a/shibsp/ServiceProvider.cpp b/shibsp/ServiceProvider.cpp index 26d40e6..3ac5236 100644 --- a/shibsp/ServiceProvider.cpp +++ b/shibsp/ServiceProvider.cpp @@ -193,7 +193,7 @@ Remoted* ServiceProvider::regListener(const char* address, Remoted* listener) if (i != m_listenerMap.end()) ret = i->second; m_listenerMap[address] = listener; - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").info("registered remoted message endpoint (%s)",address); + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").info("registered remoted message endpoint (%s)",address); return ret; } @@ -205,7 +205,7 @@ bool ServiceProvider::unregListener(const char* address, Remoted* current, Remot m_listenerMap[address] = restore; else m_listenerMap.erase(address); - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").info("unregistered remoted message endpoint (%s)",address); + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").info("unregistered remoted message endpoint (%s)",address); return true; } return false; @@ -222,7 +222,7 @@ pair ServiceProvider::doAuthentication(SPRequest& request, bool handl #ifdef _DEBUG xmltooling::NDC ndc("doAuthentication"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".ServiceProvider"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider"); const Application* app = nullptr; string targetURL = request.getRequestURL(); @@ -370,7 +370,7 @@ pair ServiceProvider::doAuthorization(SPRequest& request) const #ifdef _DEBUG xmltooling::NDC ndc("doAuthorization"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".ServiceProvider"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider"); const Application* app = nullptr; Session* session = nullptr; @@ -440,7 +440,7 @@ pair ServiceProvider::doExport(SPRequest& request, bool requireSessio #ifdef _DEBUG xmltooling::NDC ndc("doExport"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".ServiceProvider"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider"); const Application* app = nullptr; Session* session = nullptr; @@ -605,7 +605,7 @@ pair ServiceProvider::doHandler(SPRequest& request) const #ifdef _DEBUG xmltooling::NDC ndc("doHandler"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".ServiceProvider"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider"); const Application* app = nullptr; string targetURL = request.getRequestURL(); diff --git a/shibsp/attribute/Base64AttributeDecoder.cpp b/shibsp/attribute/Base64AttributeDecoder.cpp index 88fcff8..e86e6be 100644 --- a/shibsp/attribute/Base64AttributeDecoder.cpp +++ b/shibsp/attribute/Base64AttributeDecoder.cpp @@ -73,7 +73,7 @@ shibsp::Attribute* Base64AttributeDecoder::decode( vector& dest = simple->getValues(); pair::const_iterator,vector::const_iterator> valrange; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.Base64"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.Base64"); if (xmlObject && XMLString::equals(opensaml::saml1::Attribute::LOCAL_NAME,xmlObject->getElementQName().getLocalPart())) { const opensaml::saml2::Attribute* saml2attr = dynamic_cast(xmlObject); diff --git a/shibsp/attribute/DOMAttributeDecoder.cpp b/shibsp/attribute/DOMAttributeDecoder.cpp index 1dd3c18..2aad842 100644 --- a/shibsp/attribute/DOMAttributeDecoder.cpp +++ b/shibsp/attribute/DOMAttributeDecoder.cpp @@ -75,7 +75,7 @@ namespace shibsp { DOMAttributeDecoder::DOMAttributeDecoder(const DOMElement* e) : AttributeDecoder(e), m_formatter(XMLHelper::getAttrString(e, nullptr, formatter)) { - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.DOM"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.DOM"); e = XMLHelper::getFirstChildElement(e, Mapping); while (e) { @@ -101,7 +101,7 @@ Attribute* DOMAttributeDecoder::decode( const GenericRequest* request, const vector& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty ) const { - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.DOM"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.DOM"); if (!xmlObject) return nullptr; diff --git a/shibsp/attribute/KeyInfoAttributeDecoder.cpp b/shibsp/attribute/KeyInfoAttributeDecoder.cpp index 7433b0e..ecff131 100644 --- a/shibsp/attribute/KeyInfoAttributeDecoder.cpp +++ b/shibsp/attribute/KeyInfoAttributeDecoder.cpp @@ -109,7 +109,7 @@ Attribute* KeyInfoAttributeDecoder::decode( const GenericRequest*, const vector& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty ) const { - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.KeyInfo"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.KeyInfo"); if (!xmlObject || !XMLString::equals(saml1::Attribute::LOCAL_NAME, xmlObject->getElementQName().getLocalPart())) { log.warn("XMLObject type not recognized by KeyInfoAttributeDecoder, no values returned"); diff --git a/shibsp/attribute/NameIDAttribute.cpp b/shibsp/attribute/NameIDAttribute.cpp index 43a78b7..f8ff129 100644 --- a/shibsp/attribute/NameIDAttribute.cpp +++ b/shibsp/attribute/NameIDAttribute.cpp @@ -169,7 +169,7 @@ const vector& NameIDAttribute::getSerializedValues() const m_serialized.push_back(out.string()); } catch (exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".Attribute.NameID").error("exception remoting hash operation: %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".Attribute.NameID").error("exception remoting hash operation: %s", ex.what()); } #endif } diff --git a/shibsp/attribute/NameIDAttributeDecoder.cpp b/shibsp/attribute/NameIDAttributeDecoder.cpp index 6adf938..d3a198b 100644 --- a/shibsp/attribute/NameIDAttributeDecoder.cpp +++ b/shibsp/attribute/NameIDAttributeDecoder.cpp @@ -89,7 +89,7 @@ shibsp::Attribute* NameIDAttributeDecoder::decode( vector& dest = nameid->getValues(); vector::const_iterator v,stop; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.NameID"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.NameID"); if (xmlObject && XMLString::equals(opensaml::saml1::Attribute::LOCAL_NAME,xmlObject->getElementQName().getLocalPart())) { const opensaml::saml2::Attribute* saml2attr = dynamic_cast(xmlObject); diff --git a/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp b/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp index e842d7f..5fc5476 100644 --- a/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp +++ b/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp @@ -98,7 +98,7 @@ shibsp::Attribute* NameIDFromScopedAttributeDecoder::decode( vector& dest = nameid->getValues(); pair::const_iterator,vector::const_iterator> valrange; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.NameIDFromScoped"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.NameIDFromScoped"); if (xmlObject && XMLString::equals(opensaml::saml1::Attribute::LOCAL_NAME,xmlObject->getElementQName().getLocalPart())) { const opensaml::saml2::Attribute* saml2attr = dynamic_cast(xmlObject); diff --git a/shibsp/attribute/ScopedAttributeDecoder.cpp b/shibsp/attribute/ScopedAttributeDecoder.cpp index d30a32a..7a667b7 100644 --- a/shibsp/attribute/ScopedAttributeDecoder.cpp +++ b/shibsp/attribute/ScopedAttributeDecoder.cpp @@ -85,7 +85,7 @@ shibsp::Attribute* ScopedAttributeDecoder::decode( vector< pair >& dest = scoped->getValues(); pair::const_iterator,vector::const_iterator> valrange; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.Scoped"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.Scoped"); if (xmlObject && XMLString::equals(opensaml::saml1::Attribute::LOCAL_NAME,xmlObject->getElementQName().getLocalPart())) { const opensaml::saml2::Attribute* saml2attr = dynamic_cast(xmlObject); diff --git a/shibsp/attribute/StringAttributeDecoder.cpp b/shibsp/attribute/StringAttributeDecoder.cpp index e52d8f1..b46af05 100644 --- a/shibsp/attribute/StringAttributeDecoder.cpp +++ b/shibsp/attribute/StringAttributeDecoder.cpp @@ -70,7 +70,7 @@ shibsp::Attribute* StringAttributeDecoder::decode( vector& dest = simple->getValues(); pair::const_iterator,vector::const_iterator> valrange; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.String"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.String"); if (xmlObject && XMLString::equals(opensaml::saml1::Attribute::LOCAL_NAME,xmlObject->getElementQName().getLocalPart())) { const opensaml::saml2::Attribute* saml2attr = dynamic_cast(xmlObject); diff --git a/shibsp/attribute/XMLAttributeDecoder.cpp b/shibsp/attribute/XMLAttributeDecoder.cpp index 551206f..de4630e 100644 --- a/shibsp/attribute/XMLAttributeDecoder.cpp +++ b/shibsp/attribute/XMLAttributeDecoder.cpp @@ -75,7 +75,7 @@ Attribute* XMLAttributeDecoder::decode( if (!xmlObject) return nullptr; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.XML"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.XML"); auto_ptr attr(new XMLAttribute(ids)); vector& dest = attr->getValues(); diff --git a/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp b/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp index 4a481d7..7677692 100644 --- a/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp +++ b/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp @@ -63,7 +63,7 @@ namespace shibsp { throw ConfigurationException("AttributeValueString MatchFunctor requires non-empty value attribute."); } if (e && e->hasAttributeNS(nullptr, ignoreCase)) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "ignoreCase property ignored by AttributeValueString MatchFunctor in favor of attribute's caseSensitive property" ); } diff --git a/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp b/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp index eaee280..4ce7864 100644 --- a/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp +++ b/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp @@ -79,7 +79,7 @@ ChainingAttributeFilter::ChainingAttributeFilter(const DOMElement* e) while (e) { string t(XMLHelper::getAttrString(e, nullptr, _type)); if (!t.empty()) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter.Chaining").info("building AttributeFilter of type (%s)...", t.c_str()); + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter.Chaining").info("building AttributeFilter of type (%s)...", t.c_str()); auto_ptr np(SPConfig::getConfig().AttributeFilterManager.newPlugin(t.c_str(), e)); m_filters.push_back(np.get()); np.release(); diff --git a/shibsp/attribute/filtering/impl/DummyAttributeFilter.cpp b/shibsp/attribute/filtering/impl/DummyAttributeFilter.cpp index d4f5660..a323699 100644 --- a/shibsp/attribute/filtering/impl/DummyAttributeFilter.cpp +++ b/shibsp/attribute/filtering/impl/DummyAttributeFilter.cpp @@ -49,7 +49,7 @@ namespace shibsp { } void filterAttributes(const FilteringContext& context, vector& attributes) const { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter.Dummy").warn("filtering out all attributes"); + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter.Dummy").warn("filtering out all attributes"); for_each(attributes.begin(), attributes.end(), xmltooling::cleanup()); attributes.clear(); } diff --git a/shibsp/attribute/filtering/impl/NameIDQualifierStringFunctor.cpp b/shibsp/attribute/filtering/impl/NameIDQualifierStringFunctor.cpp index daaa692..69546b6 100644 --- a/shibsp/attribute/filtering/impl/NameIDQualifierStringFunctor.cpp +++ b/shibsp/attribute/filtering/impl/NameIDQualifierStringFunctor.cpp @@ -105,7 +105,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext { const NameIDAttribute* nameattr = dynamic_cast(&attribute); if (!nameattr) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor applied to non-NameID-valued attribute (%s)", attribute.getId() ); return false; @@ -117,7 +117,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext auto_ptr_char issuer(filterContext.getAttributeIssuer()); if (issuer.get() && *issuer.get()) { if (val.m_NameQualifier != issuer.get()) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting NameQualifier (%s), should be (%s)", val.m_NameQualifier.c_str(), issuer.get() ); @@ -125,7 +125,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext } } else { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting NameQualifier (%s), attribute issuer unknown", val.m_NameQualifier.c_str() ); @@ -133,7 +133,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext } } else if (m_matchNameQualifier != val.m_NameQualifier) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting NameQualifier (%s), should be (%s)", val.m_NameQualifier.c_str(), m_matchNameQualifier.c_str() ); @@ -145,7 +145,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext auto_ptr_char req(filterContext.getAttributeRequester()); if (req.get() && *req.get()) { if (val.m_SPNameQualifier != req.get()) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting SPNameQualifier (%s), should be (%s)", val.m_SPNameQualifier.c_str(), req.get() ); @@ -153,7 +153,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext } } else { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting SPNameQualifier (%s), attribute requester unknown", val.m_SPNameQualifier.c_str() ); @@ -161,7 +161,7 @@ bool NameIDQualifierStringFunctor::matches(const FilteringContext& filterContext } } else if (m_matchSPNameQualifier != val.m_SPNameQualifier) { - Category::getInstance(SHIBSP_LOGCAT".AttributeFilter").warn( + Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter").warn( "NameIDQualifierString MatchFunctor rejecting SPNameQualifier (%s), should be (%s)", val.m_SPNameQualifier.c_str(), m_matchSPNameQualifier.c_str() ); diff --git a/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp b/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp index e2e703c..895ac0a 100644 --- a/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp +++ b/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp @@ -106,7 +106,7 @@ namespace shibsp { class SHIBSP_DLLLOCAL XMLFilter : public AttributeFilter, public ReloadableXMLFile { public: - XMLFilter(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".AttributeFilter")) { + XMLFilter(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".AttributeFilter")) { background_load(); } ~XMLFilter() { diff --git a/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp index 850e753..c03cfd8 100644 --- a/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp +++ b/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp @@ -163,7 +163,7 @@ ChainingAttributeExtractor::ChainingAttributeExtractor(const DOMElement* e) string t(XMLHelper::getAttrString(e, nullptr, _type)); if (!t.empty()) { try { - Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.Chaining").info( + Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Chaining").info( "building AttributeExtractor of type (%s)...", t.c_str() ); auto_ptr np(conf.AttributeExtractorManager.newPlugin(t.c_str(), e)); @@ -171,7 +171,7 @@ ChainingAttributeExtractor::ChainingAttributeExtractor(const DOMElement* e) np.release(); } catch (exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.Chaining").error( + Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Chaining").error( "caught exception processing embedded AttributeExtractor element: %s", ex.what() ); } diff --git a/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp b/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp index c831409..d4227f9 100644 --- a/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp +++ b/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp @@ -233,7 +233,7 @@ ChainingAttributeResolver::ChainingAttributeResolver(const DOMElement* e) string t(XMLHelper::getAttrString(e, nullptr, _type)); if (!t.empty()) { try { - Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).info( + Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).info( "building AttributeResolver of type (%s)...", t.c_str() ); auto_ptr np(conf.AttributeResolverManager.newPlugin(t.c_str(), e)); @@ -241,7 +241,7 @@ ChainingAttributeResolver::ChainingAttributeResolver(const DOMElement* e) np.release(); } catch (exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error( + Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error( "caught exception processing embedded AttributeResolver element: %s", ex.what() ); } @@ -275,7 +275,7 @@ void ChainingAttributeResolver::resolveAttributes(ResolutionContext& ctx) const context->getResolvedAssertions().clear(); } catch (exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error( + Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error( "caught exception applying AttributeResolver in chain: %s", ex.what() ); } diff --git a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp index 2600a89..5e3a3db 100644 --- a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp +++ b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp @@ -107,7 +107,7 @@ void DelegationExtractor::extractAttributes( if (!assertion || !assertion->getConditions()) return; - Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.Delegation"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Delegation"); const vector& conditions = const_cast(assertion->getConditions())->getConditions(); for (vector::const_iterator c = conditions.begin(); c != conditions.end(); ++c) { diff --git a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp index a9e4dc4..05f63aa 100644 --- a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp +++ b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp @@ -249,7 +249,7 @@ namespace shibsp { }; QueryResolver::QueryResolver(const DOMElement* e) - : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver.Query")), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.Query")), m_policyId(XMLHelper::getAttrString(e, nullptr, policyId)), m_subjectMatch(XMLHelper::getAttrBool(e, false, subjectMatch)) { diff --git a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp index 3db18e8..dfe739f 100644 --- a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp +++ b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp @@ -244,7 +244,7 @@ namespace shibsp { }; SimpleAggregationResolver::SimpleAggregationResolver(const DOMElement* e) - : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver.SimpleAggregation")), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.SimpleAggregation")), m_policyId(XMLHelper::getAttrString(e, nullptr, policyId)), m_subjectMatch(XMLHelper::getAttrBool(e, false, subjectMatch)) { diff --git a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp index 3f12eb8..ffd9108 100644 --- a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp +++ b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp @@ -142,7 +142,7 @@ namespace shibsp { class XMLExtractor : public AttributeExtractor, public ReloadableXMLFile { public: - XMLExtractor(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.XML")) { + XMLExtractor(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.XML")) { if (m_local && m_lock) m_log.warn("attribute mappings are reloadable; be sure to restart web server when adding new attribute IDs"); background_load(); diff --git a/shibsp/binding/impl/ArtifactResolver.cpp b/shibsp/binding/impl/ArtifactResolver.cpp index 3f6b4a0..edff5c5 100644 --- a/shibsp/binding/impl/ArtifactResolver.cpp +++ b/shibsp/binding/impl/ArtifactResolver.cpp @@ -113,7 +113,7 @@ saml1p::Response* ArtifactResolver::resolve( response = client.receiveSAML(); } catch (std::exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".ArtifactResolver").error("exception resolving SAML 1.x artifact(s): %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".ArtifactResolver").error("exception resolving SAML 1.x artifact(s): %s", ex.what()); soaper.reset(); } } @@ -140,7 +140,7 @@ ArtifactResponse* ArtifactResolver::resolve( opensaml::SecurityPolicy& policy ) const { - Category& log = Category::getInstance(SHIBSP_LOGCAT".ArtifactResolver"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".ArtifactResolver"); MetadataCredentialCriteria mcc(ssoDescriptor); shibsp::SecurityPolicy& sppolicy = dynamic_cast(policy); diff --git a/shibsp/binding/impl/SOAPClient.cpp b/shibsp/binding/impl/SOAPClient.cpp index 990d640..8ecb29b 100644 --- a/shibsp/binding/impl/SOAPClient.cpp +++ b/shibsp/binding/impl/SOAPClient.cpp @@ -119,11 +119,11 @@ void SOAPClient::send(const soap11::Envelope& env, const char* from, MetadataCre } } else { - Category::getInstance(SHIBSP_LOGCAT".SOAPClient").warn("no signing credential resolved, leaving message unsigned"); + Category::getInstance(SHIBSP_LOGCAT ".SOAPClient").warn("no signing credential resolved, leaving message unsigned"); } } else { - Category::getInstance(SHIBSP_LOGCAT".SOAPClient").warn("no CredentialResolver available, leaving unsigned"); + Category::getInstance(SHIBSP_LOGCAT ".SOAPClient").warn("no CredentialResolver available, leaving unsigned"); } } @@ -135,7 +135,7 @@ void SOAPClient::prepareTransport(SOAPTransport& transport) #ifdef _DEBUG xmltooling::NDC("prepareTransport"); #endif - Category& log=Category::getInstance(SHIBSP_LOGCAT".SOAPClient"); + Category& log=Category::getInstance(SHIBSP_LOGCAT ".SOAPClient"); log.debug("prepping SOAP transport for use by application (%s)", m_app.getId()); pair flag = m_relyingParty->getBool("requireConfidentiality"); diff --git a/shibsp/binding/impl/XMLProtocolProvider.cpp b/shibsp/binding/impl/XMLProtocolProvider.cpp index 4c48a7f..3084076 100644 --- a/shibsp/binding/impl/XMLProtocolProvider.cpp +++ b/shibsp/binding/impl/XMLProtocolProvider.cpp @@ -94,7 +94,7 @@ namespace shibsp { { public: XMLProtocolProvider(const DOMElement* e) - : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".ProtocolProvider.XML")) { + : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".ProtocolProvider.XML")) { background_load(); // guarantees an exception or the policy is loaded } diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp index 37db704..d7adee0 100644 --- a/shibsp/handler/impl/AbstractHandler.cpp +++ b/shibsp/handler/impl/AbstractHandler.cpp @@ -168,7 +168,7 @@ const XMLCh* Handler::getProtocolFamily() const void Handler::log(SPRequest::SPLogLevel level, const string& msg) const { - Category::getInstance(SHIBSP_LOGCAT".Handler").log( + Category::getInstance(SHIBSP_LOGCAT ".Handler").log( (level == SPRequest::SPDebug ? Priority::DEBUG : (level == SPRequest::SPInfo ? Priority::INFO : (level == SPRequest::SPWarn ? Priority::WARN : diff --git a/shibsp/handler/impl/AssertionLookup.cpp b/shibsp/handler/impl/AssertionLookup.cpp index 7063049..e031f27 100644 --- a/shibsp/handler/impl/AssertionLookup.cpp +++ b/shibsp/handler/impl/AssertionLookup.cpp @@ -84,7 +84,7 @@ namespace shibsp { }; AssertionLookup::AssertionLookup(const DOMElement* e, const char* appId) - : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT".AssertionLookup"), "exportACL", "127.0.0.1 ::1") + : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT ".AssertionLookup"), "exportACL", "127.0.0.1 ::1") { setAddress("run::AssertionLookup"); } diff --git a/shibsp/handler/impl/AttributeCheckerHandler.cpp b/shibsp/handler/impl/AttributeCheckerHandler.cpp index 5ca63fd..d4b86a9 100644 --- a/shibsp/handler/impl/AttributeCheckerHandler.cpp +++ b/shibsp/handler/impl/AttributeCheckerHandler.cpp @@ -110,7 +110,7 @@ namespace shibsp { }; AttributeCheckerHandler::AttributeCheckerHandler(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".AttributeCheckerHandler"), &g_Blocker) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".AttributeCheckerHandler"), &g_Blocker) { if (!SPConfig::getConfig().isEnabled(SPConfig::InProcess)) return; diff --git a/shibsp/handler/impl/ChainingLogoutInitiator.cpp b/shibsp/handler/impl/ChainingLogoutInitiator.cpp index f3aa7ab..5dcba2c 100644 --- a/shibsp/handler/impl/ChainingLogoutInitiator.cpp +++ b/shibsp/handler/impl/ChainingLogoutInitiator.cpp @@ -96,7 +96,7 @@ namespace shibsp { }; ChainingLogoutInitiator::ChainingLogoutInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".LogoutInitiator.Chaining"), &g_LINFilter) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".LogoutInitiator.Chaining"), &g_LINFilter) { SPConfig& conf = SPConfig::getConfig(); diff --git a/shibsp/handler/impl/ChainingSessionInitiator.cpp b/shibsp/handler/impl/ChainingSessionInitiator.cpp index ecb881c..eac9185 100644 --- a/shibsp/handler/impl/ChainingSessionInitiator.cpp +++ b/shibsp/handler/impl/ChainingSessionInitiator.cpp @@ -97,7 +97,7 @@ namespace shibsp { }; ChainingSessionInitiator::ChainingSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.Chaining"), &g_SINFilter) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Chaining"), &g_SINFilter) { SPConfig& conf = SPConfig::getConfig(); diff --git a/shibsp/handler/impl/CookieSessionInitiator.cpp b/shibsp/handler/impl/CookieSessionInitiator.cpp index 154ef3d..244d46d 100644 --- a/shibsp/handler/impl/CookieSessionInitiator.cpp +++ b/shibsp/handler/impl/CookieSessionInitiator.cpp @@ -55,7 +55,7 @@ namespace shibsp { { public: CookieSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.Cookie")), + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Cookie")), m_followMultiple(getBool("followMultiple").second) { m_supportedOptions.insert("isPassive"); } diff --git a/shibsp/handler/impl/DiscoveryFeed.cpp b/shibsp/handler/impl/DiscoveryFeed.cpp index 4b9c438..f0f3514 100644 --- a/shibsp/handler/impl/DiscoveryFeed.cpp +++ b/shibsp/handler/impl/DiscoveryFeed.cpp @@ -111,7 +111,7 @@ namespace shibsp { }; DiscoveryFeed::DiscoveryFeed(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".DiscoveryFeed"), &g_Blocker), m_cacheToClient(false) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".DiscoveryFeed"), &g_Blocker), m_cacheToClient(false) { pair prop = getString("Location"); if (!prop.first) diff --git a/shibsp/handler/impl/ExternalAuthHandler.cpp b/shibsp/handler/impl/ExternalAuthHandler.cpp index 813530f..c17ca1f 100644 --- a/shibsp/handler/impl/ExternalAuthHandler.cpp +++ b/shibsp/handler/impl/ExternalAuthHandler.cpp @@ -164,7 +164,7 @@ namespace { }; ExternalAuth::ExternalAuth(const DOMElement* e, const char* appId) - : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT".ExternalAuth"), "acl", "127.0.0.1 ::1") + : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT ".ExternalAuth"), "acl", "127.0.0.1 ::1") { setAddress("run::ExternalAuth"); } diff --git a/shibsp/handler/impl/FormSessionInitiator.cpp b/shibsp/handler/impl/FormSessionInitiator.cpp index a3e654f..b950e63 100644 --- a/shibsp/handler/impl/FormSessionInitiator.cpp +++ b/shibsp/handler/impl/FormSessionInitiator.cpp @@ -52,7 +52,7 @@ namespace shibsp { { public: FormSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.Form")), m_template(getString("template").second) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Form")), m_template(getString("template").second) { if (!m_template) throw ConfigurationException("Form SessionInitiator requires a template property."); } diff --git a/shibsp/handler/impl/LocalLogoutInitiator.cpp b/shibsp/handler/impl/LocalLogoutInitiator.cpp index 5531fd2..5800d27 100644 --- a/shibsp/handler/impl/LocalLogoutInitiator.cpp +++ b/shibsp/handler/impl/LocalLogoutInitiator.cpp @@ -77,7 +77,7 @@ namespace shibsp { }; LocalLogoutInitiator::LocalLogoutInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".LogoutInitiator.Local")), m_appId(appId) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".LogoutInitiator.Local")), m_appId(appId) { pair loc = getString("Location"); if (loc.first) { diff --git a/shibsp/handler/impl/LogoutHandler.cpp b/shibsp/handler/impl/LogoutHandler.cpp index 40f1aae..ae989ef 100644 --- a/shibsp/handler/impl/LogoutHandler.cpp +++ b/shibsp/handler/impl/LogoutHandler.cpp @@ -113,7 +113,7 @@ void LogoutHandler::receive(DDF& in, ostream& out) const Application* app=aid ? SPConfig::getConfig().getServiceProvider()->getApplication(aid) : nullptr; if (!app) { // Something's horribly wrong. - Category::getInstance(SHIBSP_LOGCAT".Logout").error("couldn't find application (%s) for logout", aid ? aid : "(missing)"); + Category::getInstance(SHIBSP_LOGCAT ".Logout").error("couldn't find application (%s) for logout", aid ? aid : "(missing)"); throw ConfigurationException("Unable to locate application for logout, deleted?"); } @@ -224,7 +224,7 @@ bool LogoutHandler::notifyBackChannel( ) const { if (sessions.empty()) { - Category::getInstance(SHIBSP_LOGCAT".Logout").error("no sessions supplied to back channel notification method"); + Category::getInstance(SHIBSP_LOGCAT ".Logout").error("no sessions supplied to back channel notification method"); return false; } @@ -256,7 +256,7 @@ bool LogoutHandler::notifyBackChannel( delete soaper.receive(); } catch (std::exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".Logout").error("error notifying application of logout event: %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".Logout").error("error notifying application of logout event: %s", ex.what()); result = false; } soaper.reset(); @@ -309,11 +309,11 @@ LogoutEvent* LogoutHandler::newLogoutEvent( return logout_event; } else { - Category::getInstance(SHIBSP_LOGCAT".Logout").warn("unable to audit event, log event object was of an incorrect type"); + Category::getInstance(SHIBSP_LOGCAT ".Logout").warn("unable to audit event, log event object was of an incorrect type"); } } catch (std::exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".Logout").warn("exception auditing event: %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".Logout").warn("exception auditing event: %s", ex.what()); } return nullptr; } diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp index 79c92e2..29a7531 100644 --- a/shibsp/handler/impl/MetadataGenerator.cpp +++ b/shibsp/handler/impl/MetadataGenerator.cpp @@ -186,7 +186,7 @@ namespace shibsp { }; MetadataGenerator::MetadataGenerator(const DOMElement* e, const char* appId) - : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT".MetadataGenerator")) + : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT ".MetadataGenerator")) #ifndef SHIBSP_LITE ,m_http(0), m_https(0), m_encryptionBuilder(nullptr), m_digestBuilder(nullptr) #endif diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp index 668ed9d..529682a 100644 --- a/shibsp/handler/impl/RemotedHandler.cpp +++ b/shibsp/handler/impl/RemotedHandler.cpp @@ -210,10 +210,10 @@ const std::vector& RemotedRequest::getClientCertificates() cons } catch(XSECException& e) { auto_ptr_char temp(e.getMsg()); - Category::getInstance(SHIBSP_LOGCAT".SPRequest").error("XML-Security exception loading client certificate: %s", temp.get()); + Category::getInstance(SHIBSP_LOGCAT ".SPRequest").error("XML-Security exception loading client certificate: %s", temp.get()); } catch(XSECCryptoException& e) { - Category::getInstance(SHIBSP_LOGCAT".SPRequest").error("XML-Security exception loading client certificate: %s", e.getMsg()); + Category::getInstance(SHIBSP_LOGCAT ".SPRequest").error("XML-Security exception loading client certificate: %s", e.getMsg()); } cert = certs.next(); } @@ -334,7 +334,7 @@ void RemotedHandler::setAddress(const char* address) if (listener) listener->regListener(m_address.c_str(), this); else - Category::getInstance(SHIBSP_LOGCAT".Handler").info("no ListenerService available, handler remoting disabled"); + Category::getInstance(SHIBSP_LOGCAT ".Handler").info("no ListenerService available, handler remoting disabled"); } } diff --git a/shibsp/handler/impl/SAML1Consumer.cpp b/shibsp/handler/impl/SAML1Consumer.cpp index 0b663a2..310c1e2 100644 --- a/shibsp/handler/impl/SAML1Consumer.cpp +++ b/shibsp/handler/impl/SAML1Consumer.cpp @@ -72,7 +72,7 @@ namespace shibsp { { public: SAML1Consumer(const DOMElement* e, const char* appId) - : AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".SSO.SAML1")) { + : AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT ".SSO.SAML1")) { #ifndef SHIBSP_LITE m_post = XMLString::equals(getString("Binding").second, samlconstants::SAML1_PROFILE_BROWSER_POST); if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) diff --git a/shibsp/handler/impl/SAML2ArtifactResolution.cpp b/shibsp/handler/impl/SAML2ArtifactResolution.cpp index a267af5..ae1150c 100644 --- a/shibsp/handler/impl/SAML2ArtifactResolution.cpp +++ b/shibsp/handler/impl/SAML2ArtifactResolution.cpp @@ -142,7 +142,7 @@ namespace shibsp { }; SAML2ArtifactResolution::SAML2ArtifactResolution(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".ArtifactResolution.SAML2")) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".ArtifactResolution.SAML2")) { #ifndef SHIBSP_LITE if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { diff --git a/shibsp/handler/impl/SAML2Consumer.cpp b/shibsp/handler/impl/SAML2Consumer.cpp index be2397c..d7d8fa9 100644 --- a/shibsp/handler/impl/SAML2Consumer.cpp +++ b/shibsp/handler/impl/SAML2Consumer.cpp @@ -72,7 +72,7 @@ namespace shibsp { { public: SAML2Consumer(const DOMElement* e, const char* appId) - : AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".SSO.SAML2")) { + : AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT ".SSO.SAML2")) { #ifndef SHIBSP_LITE if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) m_ssoRule.reset(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(BEARER_POLICY_RULE, e)); diff --git a/shibsp/handler/impl/SAML2Logout.cpp b/shibsp/handler/impl/SAML2Logout.cpp index cd43dda..cde5cbb 100644 --- a/shibsp/handler/impl/SAML2Logout.cpp +++ b/shibsp/handler/impl/SAML2Logout.cpp @@ -146,7 +146,7 @@ namespace shibsp { }; SAML2Logout::SAML2Logout(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".Logout.SAML2")) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".Logout.SAML2")) #ifndef SHIBSP_LITE ,m_protocol(samlconstants::SAML20P_NS) #endif diff --git a/shibsp/handler/impl/SAML2LogoutInitiator.cpp b/shibsp/handler/impl/SAML2LogoutInitiator.cpp index a1056ca..83a7a02 100644 --- a/shibsp/handler/impl/SAML2LogoutInitiator.cpp +++ b/shibsp/handler/impl/SAML2LogoutInitiator.cpp @@ -119,7 +119,7 @@ namespace shibsp { }; SAML2LogoutInitiator::SAML2LogoutInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".LogoutInitiator.SAML2")), m_appId(appId), m_protocol(samlconstants::SAML20P_NS) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".LogoutInitiator.SAML2")), m_appId(appId), m_protocol(samlconstants::SAML20P_NS) #ifndef SHIBSP_LITE ,m_async(true) #endif diff --git a/shibsp/handler/impl/SAML2NameIDMgmt.cpp b/shibsp/handler/impl/SAML2NameIDMgmt.cpp index 47994f8..34bc87d 100644 --- a/shibsp/handler/impl/SAML2NameIDMgmt.cpp +++ b/shibsp/handler/impl/SAML2NameIDMgmt.cpp @@ -136,7 +136,7 @@ namespace shibsp { }; SAML2NameIDMgmt::SAML2NameIDMgmt(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".NameIDMgmt.SAML2")) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".NameIDMgmt.SAML2")) { #ifndef SHIBSP_LITE if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { diff --git a/shibsp/handler/impl/SAML2SessionInitiator.cpp b/shibsp/handler/impl/SAML2SessionInitiator.cpp index 3cfe0b0..d4265c3 100644 --- a/shibsp/handler/impl/SAML2SessionInitiator.cpp +++ b/shibsp/handler/impl/SAML2SessionInitiator.cpp @@ -149,7 +149,7 @@ namespace shibsp { }; SAML2SessionInitiator::SAML2SessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.SAML2"), &g_SINFilter, &m_remapper), m_appId(appId), + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.SAML2"), &g_SINFilter, &m_remapper), m_appId(appId), m_paosNS(samlconstants::PAOS_NS), m_ecpNS(samlconstants::SAML20ECP_NS), m_paosBinding(samlconstants::SAML20_BINDING_PAOS) #ifdef SHIBSP_LITE ,m_ecp(false) diff --git a/shibsp/handler/impl/SAMLDSSessionInitiator.cpp b/shibsp/handler/impl/SAMLDSSessionInitiator.cpp index b9e1b82..1d77698 100644 --- a/shibsp/handler/impl/SAMLDSSessionInitiator.cpp +++ b/shibsp/handler/impl/SAMLDSSessionInitiator.cpp @@ -122,7 +122,7 @@ namespace shibsp { }; SAMLDSSessionInitiator::SAMLDSSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.SAMLDS")), m_url(nullptr), m_returnParam(nullptr) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.SAMLDS")), m_url(nullptr), m_returnParam(nullptr) { pair url = getString("URL"); if (!url.first) diff --git a/shibsp/handler/impl/SessionHandler.cpp b/shibsp/handler/impl/SessionHandler.cpp index 34454b9..ba8f71a 100644 --- a/shibsp/handler/impl/SessionHandler.cpp +++ b/shibsp/handler/impl/SessionHandler.cpp @@ -74,7 +74,7 @@ namespace shibsp { }; SessionHandler::SessionHandler(const DOMElement* e, const char* appId) - : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionHandler")), m_values(false) + : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionHandler")), m_values(false) { pair prop = getString("contentType"); if (prop.first) diff --git a/shibsp/handler/impl/SessionInitiator.cpp b/shibsp/handler/impl/SessionInitiator.cpp index 3b66de0..3110ec7 100644 --- a/shibsp/handler/impl/SessionInitiator.cpp +++ b/shibsp/handler/impl/SessionInitiator.cpp @@ -225,11 +225,11 @@ AuthnRequestEvent* SessionInitiator::newAuthnRequestEvent(const Application& app return ar_event; } else { - Category::getInstance(SHIBSP_LOGCAT".SessionInitiator").warn("unable to audit event, log event object was of an incorrect type"); + Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator").warn("unable to audit event, log event object was of an incorrect type"); } } catch (exception& ex) { - Category::getInstance(SHIBSP_LOGCAT".SessionInitiator").warn("exception auditing event: %s", ex.what()); + Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator").warn("exception auditing event: %s", ex.what()); } return nullptr; } diff --git a/shibsp/handler/impl/Shib1SessionInitiator.cpp b/shibsp/handler/impl/Shib1SessionInitiator.cpp index 3715512..cd35d07 100644 --- a/shibsp/handler/impl/Shib1SessionInitiator.cpp +++ b/shibsp/handler/impl/Shib1SessionInitiator.cpp @@ -64,7 +64,7 @@ namespace shibsp { { public: Shib1SessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.Shib1"), nullptr, &m_remapper), m_appId(appId) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Shib1"), nullptr, &m_remapper), m_appId(appId) { // If Location isn't set, defer address registration until the setParent call. pair loc = getString("Location"); if (loc.first) { diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp index d579a3a..250e58f 100644 --- a/shibsp/handler/impl/StatusHandler.cpp +++ b/shibsp/handler/impl/StatusHandler.cpp @@ -251,7 +251,7 @@ namespace shibsp { }; StatusHandler::StatusHandler(const DOMElement* e, const char* appId) - : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT".StatusHandler")) + : SecuredHandler(e, Category::getInstance(SHIBSP_LOGCAT ".StatusHandler")) { string address(appId); address += getString("Location").second; diff --git a/shibsp/handler/impl/TransformSessionInitiator.cpp b/shibsp/handler/impl/TransformSessionInitiator.cpp index baaf4b0..02e6dc4 100644 --- a/shibsp/handler/impl/TransformSessionInitiator.cpp +++ b/shibsp/handler/impl/TransformSessionInitiator.cpp @@ -84,7 +84,7 @@ namespace shibsp { { public: TransformSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.Transform"), &g_TSINFilter), m_appId(appId) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Transform"), &g_TSINFilter), m_appId(appId) { // If Location isn't set, defer address registration until the setParent call. pair loc = getString("Location"); if (loc.first) { diff --git a/shibsp/handler/impl/WAYFSessionInitiator.cpp b/shibsp/handler/impl/WAYFSessionInitiator.cpp index 88ab294..b04f018 100644 --- a/shibsp/handler/impl/WAYFSessionInitiator.cpp +++ b/shibsp/handler/impl/WAYFSessionInitiator.cpp @@ -59,7 +59,7 @@ namespace shibsp { { public: WAYFSessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.WAYF"), nullptr, &m_remapper), m_url(nullptr) { + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.WAYF"), nullptr, &m_remapper), m_url(nullptr) { pair url = getString("URL"); if (!url.first) throw ConfigurationException("WAYF SessionInitiator requires a URL property."); diff --git a/shibsp/impl/ChainingAccessControl.cpp b/shibsp/impl/ChainingAccessControl.cpp index 7681e03..92f972d 100644 --- a/shibsp/impl/ChainingAccessControl.cpp +++ b/shibsp/impl/ChainingAccessControl.cpp @@ -107,7 +107,7 @@ ChainingAccessControl::ChainingAccessControl(const DOMElement* e) : m_op(OP_AND) while (e) { string t(XMLHelper::getAttrString(e, nullptr, _type)); if (!t.empty()) { - Category::getInstance(SHIBSP_LOGCAT".AccessControl.Chaining").info("building AccessControl provider of type (%s)...", t.c_str()); + Category::getInstance(SHIBSP_LOGCAT ".AccessControl.Chaining").info("building AccessControl provider of type (%s)...", t.c_str()); auto_ptr np(SPConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), e)); m_ac.push_back(np.get()); np.release(); diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp index 0c5ffe8..f9fb5de 100644 --- a/shibsp/impl/StorageServiceSessionCache.cpp +++ b/shibsp/impl/StorageServiceSessionCache.cpp @@ -481,7 +481,7 @@ void StoredSession::validate(const Application& app, const char* client_addr, ti return; if (!SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { - DDF in("touch::"STORAGESERVICE_SESSION_CACHE"::SessionCache"), out; + DDF in("touch::" STORAGESERVICE_SESSION_CACHE "::SessionCache"), out; DDFJanitor jin(in); in.structure(); in.addmember("key").string(getID()); @@ -906,7 +906,7 @@ SessionCacheEx::~SessionCacheEx() } SSCache::SSCache(const DOMElement* e) - : m_log(Category::getInstance(SHIBSP_LOGCAT".SessionCache")), inproc(true), + : m_log(Category::getInstance(SHIBSP_LOGCAT ".SessionCache")), inproc(true), #ifndef SHIBSP_LITE m_storage(nullptr), m_storage_lite(nullptr), m_cacheAssertions(true), m_reverseIndex(true), #endif @@ -991,9 +991,9 @@ SSCache::SSCache(const DOMElement* e) #ifndef SHIBSP_LITE else { if (listener && conf.isEnabled(SPConfig::OutOfProcess)) { - listener->regListener("find::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); - listener->regListener("remove::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); - listener->regListener("touch::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); + listener->regListener("find::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); + listener->regListener("remove::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); + listener->regListener("touch::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); } else { m_log.info("no ListenerService available, cache remoting disabled"); @@ -1019,9 +1019,9 @@ SSCache::~SSCache() SPConfig& conf = SPConfig::getConfig(); ListenerService* listener=conf.getServiceProvider()->getListenerService(false); if (listener && conf.isEnabled(SPConfig::OutOfProcess)) { - listener->unregListener("find::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); - listener->unregListener("remove::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); - listener->unregListener("touch::"STORAGESERVICE_SESSION_CACHE"::SessionCache",this); + listener->unregListener("find::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); + listener->unregListener("remove::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); + listener->unregListener("touch::" STORAGESERVICE_SESSION_CACHE "::SessionCache",this); } } #endif @@ -1578,7 +1578,7 @@ Session* SSCache::find(const Application& app, const char* key, const char* clie if (!SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { m_log.debug("session not found locally, remoting the search"); // Remote the request. - DDF in("find::"STORAGESERVICE_SESSION_CACHE"::SessionCache"), out; + DDF in("find::" STORAGESERVICE_SESSION_CACHE "::SessionCache"), out; DDFJanitor jin(in); in.structure(); in.addmember("key").string(key); @@ -1800,7 +1800,7 @@ void SSCache::remove(const Application& app, const char* key) } else { // Remote the request. - DDF in("remove::"STORAGESERVICE_SESSION_CACHE"::SessionCache"); + DDF in("remove::" STORAGESERVICE_SESSION_CACHE "::SessionCache"); DDFJanitor jin(in); in.structure(); in.addmember("key").string(key); @@ -1928,7 +1928,7 @@ void SSCache::receive(DDF& in, ostream& out) if (!app) throw ListenerException("Application not found, check configuration?"); - if (!strcmp(in.name(),"find::"STORAGESERVICE_SESSION_CACHE"::SessionCache")) { + if (!strcmp(in.name(),"find::" STORAGESERVICE_SESSION_CACHE "::SessionCache")) { const char* key=in["key"].string(); if (!key) throw ListenerException("Required parameters missing for session lookup."); @@ -1981,7 +1981,7 @@ void SSCache::receive(DDF& in, ostream& out) // Send the record back. out << record; } - else if (!strcmp(in.name(),"touch::"STORAGESERVICE_SESSION_CACHE"::SessionCache")) { + else if (!strcmp(in.name(),"touch::" STORAGESERVICE_SESSION_CACHE "::SessionCache")) { const char* key=in["key"].string(); if (!key) throw ListenerException("Required parameters missing for session check."); @@ -2093,7 +2093,7 @@ void SSCache::receive(DDF& in, ostream& out) out << ret; } } - else if (!strcmp(in.name(),"remove::"STORAGESERVICE_SESSION_CACHE"::SessionCache")) { + else if (!strcmp(in.name(),"remove::" STORAGESERVICE_SESSION_CACHE "::SessionCache")) { const char* key=in["key"].string(); if (!key) throw ListenerException("Required parameter missing for session removal."); diff --git a/shibsp/impl/XMLAccessControl.cpp b/shibsp/impl/XMLAccessControl.cpp index e14a664..29829ea 100644 --- a/shibsp/impl/XMLAccessControl.cpp +++ b/shibsp/impl/XMLAccessControl.cpp @@ -111,7 +111,7 @@ namespace shibsp { { public: XMLAccessControl(const DOMElement* e) - : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".AccessControl.XML")) { + : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".AccessControl.XML")) { background_load(); // guarantees an exception or the policy is loaded } diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp index cb894dd..300a0c8 100644 --- a/shibsp/impl/XMLRequestMapper.cpp +++ b/shibsp/impl/XMLRequestMapper.cpp @@ -128,7 +128,7 @@ namespace shibsp { class XMLRequestMapper : public RequestMapper, public ReloadableXMLFile { public: - XMLRequestMapper(const DOMElement* e) : ReloadableXMLFile(e,Category::getInstance(SHIBSP_LOGCAT".RequestMapper")) { + XMLRequestMapper(const DOMElement* e) : ReloadableXMLFile(e,Category::getInstance(SHIBSP_LOGCAT ".RequestMapper")) { background_load(); } diff --git a/shibsp/impl/XMLSecurityPolicyProvider.cpp b/shibsp/impl/XMLSecurityPolicyProvider.cpp index 8c383d6..34fcb99 100644 --- a/shibsp/impl/XMLSecurityPolicyProvider.cpp +++ b/shibsp/impl/XMLSecurityPolicyProvider.cpp @@ -88,7 +88,7 @@ namespace shibsp { { public: XMLSecurityPolicyProvider(const DOMElement* e) - : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".SecurityPolicyProvider.XML")) { + : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".SecurityPolicyProvider.XML")) { background_load(); // guarantees an exception or the policy is loaded } diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp index 73ef00a..f729ed2 100644 --- a/shibsp/impl/XMLServiceProvider.cpp +++ b/shibsp/impl/XMLServiceProvider.cpp @@ -335,7 +335,7 @@ namespace { #endif { public: - XMLConfig(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".Config")) {} + XMLConfig(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT ".Config")) {} void init() { background_load(); @@ -544,7 +544,7 @@ XMLApplication::XMLApplication( #ifdef _DEBUG xmltooling::NDC ndc("XMLApplication"); #endif - Category& log = Category::getInstance(SHIBSP_LOGCAT".Application"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".Application"); // First load any property sets. map remapper; @@ -1796,7 +1796,7 @@ void XMLApplication::limitRedirect(const GenericRequest& request, const char* ur boost::bind(startsWithI, url, boost::bind(&string::c_str, _1))) != m_redirectWhitelist.end()) { return; } - Category::getInstance(SHIBSP_LOGCAT".Application").warn("redirectLimit policy enforced, blocked redirect to (%s)", url); + Category::getInstance(SHIBSP_LOGCAT ".Application").warn("redirectLimit policy enforced, blocked redirect to (%s)", url); throw opensaml::SecurityPolicyException("Blocked unacceptable redirect location."); } } @@ -2271,7 +2271,7 @@ void XMLConfig::receive(DDF& in, ostream& out) } } else { - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error( + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").error( "Storage-backed RelayState with invalid StorageService ID (%s)", id ); } @@ -2298,7 +2298,7 @@ void XMLConfig::receive(DDF& in, ostream& out) storage->createText("RelayState", rsKey.c_str(), value, time(nullptr) + 600); } else { - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error( + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").error( "Storage-backed RelayState with invalid StorageService ID (%s)", id ); } @@ -2322,7 +2322,7 @@ void XMLConfig::receive(DDF& in, ostream& out) } } else { - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error( + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").error( "Storage-backed PostData with invalid StorageService ID (%s)", id ); } @@ -2352,7 +2352,7 @@ void XMLConfig::receive(DDF& in, ostream& out) storage->createText("PostData", rsKey.c_str(), params.str().c_str(), time(nullptr) + 600); } else { - Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error( + Category::getInstance(SHIBSP_LOGCAT ".ServiceProvider").error( "Storage-backed PostData with invalid StorageService ID (%s)", id ); } diff --git a/shibsp/metadata/DynamicMetadataProvider.cpp b/shibsp/metadata/DynamicMetadataProvider.cpp index da5c808..607cad6 100644 --- a/shibsp/metadata/DynamicMetadataProvider.cpp +++ b/shibsp/metadata/DynamicMetadataProvider.cpp @@ -140,7 +140,7 @@ saml2md::EntityDescriptor* DynamicMetadataProvider::resolve(const saml2md::Metad #ifdef _DEBUG xmltooling::NDC("resolve"); #endif - Category& log=Category::getInstance(SHIBSP_LOGCAT".MetadataProvider.Dynamic"); + Category& log=Category::getInstance(SHIBSP_LOGCAT ".MetadataProvider.Dynamic"); string name; if (criteria.entityID_ascii) { diff --git a/shibsp/remoting/impl/ListenerService.cpp b/shibsp/remoting/impl/ListenerService.cpp index 312f469..174c812 100644 --- a/shibsp/remoting/impl/ListenerService.cpp +++ b/shibsp/remoting/impl/ListenerService.cpp @@ -76,7 +76,7 @@ Remoted* ListenerService::regListener(const char* address, Remoted* listener) if (i!=m_listenerMap.end()) ret=i->second; m_listenerMap[address]=listener; - Category::getInstance(SHIBSP_LOGCAT".Listener").info("registered remoted message endpoint (%s)",address); + Category::getInstance(SHIBSP_LOGCAT ".Listener").info("registered remoted message endpoint (%s)",address); return ret; } @@ -88,7 +88,7 @@ bool ListenerService::unregListener(const char* address, Remoted* current, Remot m_listenerMap[address]=restore; else m_listenerMap.erase(address); - Category::getInstance(SHIBSP_LOGCAT".Listener").info("unregistered remoted message endpoint (%s)",address); + Category::getInstance(SHIBSP_LOGCAT ".Listener").info("unregistered remoted message endpoint (%s)",address); return true; } return false; diff --git a/shibsp/remoting/impl/SocketListener.cpp b/shibsp/remoting/impl/SocketListener.cpp index a09bda2..8951175 100644 --- a/shibsp/remoting/impl/SocketListener.cpp +++ b/shibsp/remoting/impl/SocketListener.cpp @@ -165,7 +165,7 @@ void SocketPool::put(SocketListener::ShibSocket s) } SocketListener::SocketListener(const DOMElement* e) - : m_catchAll(false), log(&Category::getInstance(SHIBSP_LOGCAT".Listener")), + : m_catchAll(false), log(&Category::getInstance(SHIBSP_LOGCAT ".Listener")), m_shutdown(nullptr), m_stackSize(0), m_socket((ShibSocket)0) { // Are we a client? @@ -499,7 +499,7 @@ void ServerThread::run() int ServerThread::job() { - Category& log = Category::getInstance(SHIBSP_LOGCAT".Listener"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".Listener"); bool incomingError = true; // set false once incoming message is received ostringstream sink; diff --git a/shibsp/util/DOMPropertySet.cpp b/shibsp/util/DOMPropertySet.cpp index 3ee7a94..54a5c39 100644 --- a/shibsp/util/DOMPropertySet.cpp +++ b/shibsp/util/DOMPropertySet.cpp @@ -85,7 +85,7 @@ void DOMPropertySet::load( return; m_root=e; if (!log) - log = &Category::getInstance(SHIBSP_LOGCAT".PropertySet"); + log = &Category::getInstance(SHIBSP_LOGCAT ".PropertySet"); // Process each attribute as a property. DOMNamedNodeMap* attrs=m_root->getAttributes(); diff --git a/shibsp/util/IPRange.cpp b/shibsp/util/IPRange.cpp index e4017dd..d6f00bc 100644 --- a/shibsp/util/IPRange.cpp +++ b/shibsp/util/IPRange.cpp @@ -108,7 +108,7 @@ bool IPRange::contains(const char* address) const bool IPRange::contains(const struct sockaddr* address) const { - Category& log = Category::getInstance(SHIBSP_LOGCAT".IPRange"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".IPRange"); if (address->sa_family == AF_INET) { if (m_addressLength != 32) diff --git a/util/mdquery.cpp b/util/mdquery.cpp index 5d89e08..56f988e 100644 --- a/util/mdquery.cpp +++ b/util/mdquery.cpp @@ -128,7 +128,7 @@ int main(int argc,char* argv[]) ServiceProvider* sp=conf.getServiceProvider(); sp->lock(); - Category& log = Category::getInstance(SHIBSP_LOGCAT".Utility.MDQuery"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".Utility.MDQuery"); const Application* app = sp->getApplication(appID); if (!app) { diff --git a/util/resolvertest.cpp b/util/resolvertest.cpp index 243c907..ae04858 100644 --- a/util/resolvertest.cpp +++ b/util/resolvertest.cpp @@ -73,7 +73,7 @@ class ResolverTest : public shibsp::AssertionConsumerService { public: ResolverTest(const DOMElement* e, const char* appId) - : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".Utilities.ResolverTest")) { + : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT ".Utilities.ResolverTest")) { } virtual ~ResolverTest() {} @@ -181,7 +181,7 @@ int main(int argc,char* argv[]) ServiceProvider* sp=conf.getServiceProvider(); sp->lock(); - Category& log = Category::getInstance(SHIBSP_LOGCAT".Utility.ResolverTest"); + Category& log = Category::getInstance(SHIBSP_LOGCAT ".Utility.ResolverTest"); const Application* app = sp->getApplication(a_param); if (!app) { -- 2.1.4