From 88704b36e7a25bcd12b7995d589dec3485594c75 Mon Sep 17 00:00:00 2001 From: cantor Date: Wed, 25 Jul 2007 01:05:31 +0000 Subject: [PATCH 1/1] Refine log categories. git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@357 de75baf8-a10c-0410-a50a-987c0e22f00f --- xmltooling/security/impl/AbstractPKIXTrustEngine.cpp | 12 ++++++------ xmltooling/security/impl/ChainingCredentialResolver.cpp | 2 +- xmltooling/security/impl/ChainingTrustEngine.cpp | 2 +- xmltooling/security/impl/ExplicitKeyTrustEngine.cpp | 10 +++++----- xmltooling/security/impl/FilesystemCredentialResolver.cpp | 4 ++-- xmltooling/security/impl/InlineKeyResolver.cpp | 14 +++++++------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp index 7be35fb..4ee5691 100644 --- a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp +++ b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp @@ -140,7 +140,7 @@ bool AbstractPKIXTrustEngine::checkEntityNames( X509* certEE, const CredentialResolver& credResolver, const CredentialCriteria& criteria ) const { - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX"); // We resolve to a set of trusted credentials. vector creds; @@ -253,7 +253,7 @@ bool AbstractPKIXTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX"); if (!certEE) { log.error("X.509 credential was NULL, unable to perform validation"); @@ -294,11 +294,11 @@ bool AbstractPKIXTrustEngine::validate( NDC ndc("validate"); #endif if (!certEE) { - Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine").error("X.509 credential was NULL, unable to perform validation"); + Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").error("X.509 credential was NULL, unable to perform validation"); return false; } else if (certEE->getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) { - Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine").error("only the OpenSSL XSEC provider is supported"); + Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").error("only the OpenSSL XSEC provider is supported"); return false; } @@ -320,7 +320,7 @@ bool AbstractPKIXTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX"); const KeyInfoResolver* inlineResolver = m_keyInfoResolver; if (!inlineResolver) @@ -382,7 +382,7 @@ bool AbstractPKIXTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX"); if (!keyInfo) { log.error("unable to perform PKIX validation, KeyInfo not present"); diff --git a/xmltooling/security/impl/ChainingCredentialResolver.cpp b/xmltooling/security/impl/ChainingCredentialResolver.cpp index e0e198e..312645e 100644 --- a/xmltooling/security/impl/ChainingCredentialResolver.cpp +++ b/xmltooling/security/impl/ChainingCredentialResolver.cpp @@ -95,7 +95,7 @@ ChainingCredentialResolver::ChainingCredentialResolver(const DOMElement* e) m_resolvers.push_back(conf.CredentialResolverManager.newPlugin(type.get(),e)); } catch (exception& ex) { - Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver").error( + Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver.Chaining").error( "caught exception processing embedded CredentialResolver element: %s", ex.what() ); } diff --git a/xmltooling/security/impl/ChainingTrustEngine.cpp b/xmltooling/security/impl/ChainingTrustEngine.cpp index 1a4fb1a..eda259c 100644 --- a/xmltooling/security/impl/ChainingTrustEngine.cpp +++ b/xmltooling/security/impl/ChainingTrustEngine.cpp @@ -44,7 +44,7 @@ static const XMLCh _TrustEngine[] = UNICODE_LITERAL_11(T,r,u,s,t static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e); ChainingTrustEngine::ChainingTrustEngine(const DOMElement* e) : TrustEngine(e) { - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."CHAINING_TRUSTENGINE); e = e ? XMLHelper::getFirstChildElement(e, _TrustEngine) : NULL; while (e) { try { diff --git a/xmltooling/security/impl/ExplicitKeyTrustEngine.cpp b/xmltooling/security/impl/ExplicitKeyTrustEngine.cpp index 8b571d8..de1c6b3 100644 --- a/xmltooling/security/impl/ExplicitKeyTrustEngine.cpp +++ b/xmltooling/security/impl/ExplicitKeyTrustEngine.cpp @@ -90,7 +90,7 @@ bool ExplicitKeyTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE); vector credentials; if (criteria) { @@ -140,7 +140,7 @@ bool ExplicitKeyTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE); vector credentials; if (criteria) { @@ -193,11 +193,11 @@ bool ExplicitKeyTrustEngine::validate( NDC ndc("validate"); #endif if (!certEE) { - Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine").error("unable to validate, end-entity certificate was null"); + Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("unable to validate, end-entity certificate was null"); return false; } else if (certEE->getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) { - Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine").error("only the OpenSSL XSEC provider is supported"); + Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("only the OpenSSL XSEC provider is supported"); return false; } @@ -214,7 +214,7 @@ bool ExplicitKeyTrustEngine::validate( #ifdef _DEBUG NDC ndc("validate"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE); if (!certEE) { log.error("unable to validate, end-entity certificate was null"); diff --git a/xmltooling/security/impl/FilesystemCredentialResolver.cpp b/xmltooling/security/impl/FilesystemCredentialResolver.cpp index b7cff3f..8e29e8d 100644 --- a/xmltooling/security/impl/FilesystemCredentialResolver.cpp +++ b/xmltooling/security/impl/FilesystemCredentialResolver.cpp @@ -151,7 +151,7 @@ FilesystemCredentialResolver::FilesystemCredentialResolver(const DOMElement* e) #ifdef _DEBUG NDC ndc("FilesystemCredentialResolver"); #endif - Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver"); + Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."FILESYSTEM_CREDENTIAL_RESOLVER); const DOMElement* root=e; @@ -444,7 +444,7 @@ XSECCryptoKey* FilesystemCredentialResolver::loadKey() break; default: - Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver").error("unsupported private key type"); + Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."FILESYSTEM_CREDENTIAL_RESOLVER).error("unsupported private key type"); } EVP_PKEY_free(pkey); if (ret) diff --git a/xmltooling/security/impl/InlineKeyResolver.cpp b/xmltooling/security/impl/InlineKeyResolver.cpp index acc6953..2c2e87d 100644 --- a/xmltooling/security/impl/InlineKeyResolver.cpp +++ b/xmltooling/security/impl/InlineKeyResolver.cpp @@ -187,7 +187,7 @@ void InlineCredential::resolve(const KeyInfo* keyInfo, int types) bool InlineCredential::resolveKey(const KeyInfo* keyInfo) { - Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver"); + Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER); // Check for ds:KeyValue const vector& keyValues = keyInfo->getKeyValues(); @@ -270,7 +270,7 @@ bool InlineCredential::resolveKey(const KeyInfo* keyInfo) bool InlineCredential::resolveCerts(const KeyInfo* keyInfo) { - Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver"); + Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER); // Check for ds:X509Data const vector& x509Datas=keyInfo->getX509Datas(); @@ -334,7 +334,7 @@ bool InlineCredential::resolveCerts(const KeyInfo* keyInfo) bool InlineCredential::resolveCRL(const KeyInfo* keyInfo) { - Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver"); + Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER); // Check for ds:X509Data const vector& x509Datas=keyInfo->getX509Datas(); @@ -407,10 +407,10 @@ void InlineCredential::resolve(DSIGKeyInfoList* keyInfo, int types) } catch(XSECException& e) { auto_ptr_char temp(e.getMsg()); - Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver").error("caught XML-Security exception loading certificate: %s", temp.get()); + Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", temp.get()); } catch(XSECCryptoException& e) { - Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver").error("caught XML-Security exception loading certificate: %s", e.getMsg()); + Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", e.getMsg()); } } @@ -443,10 +443,10 @@ void InlineCredential::resolve(DSIGKeyInfoList* keyInfo, int types) } catch(XSECException& e) { auto_ptr_char temp(e.getMsg()); - Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver").error("caught XML-Security exception loading CRL: %s", temp.get()); + Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", temp.get()); } catch(XSECCryptoException& e) { - Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver").error("caught XML-Security exception loading CRL: %s", e.getMsg()); + Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", e.getMsg()); } } } -- 2.1.4