/*
- * Copyright 2001-2007 Internet2
- *
+ * Copyright 2001-2009 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
/**
* XMLToolingConfig.cpp
- *
- * Library configuration
+ *
+ * Library configuration
*/
#include "internal.h"
#include "exceptions.h"
+#include "logging.h"
#include "XMLToolingConfig.h"
#include "encryption/Encryption.h"
#include "encryption/Encrypter.h"
#include "soap/SOAP.h"
#include "soap/SOAPTransport.h"
#include "util/NDC.h"
+#include "util/PathResolver.h"
#include "util/ReplayCache.h"
#include "util/StorageService.h"
#include "util/TemplateEngine.h"
#endif
#include <stdexcept>
-#include <log4cpp/Category.hh>
-#include <log4cpp/PropertyConfigurator.hh>
-#include <log4cpp/OstreamAppender.hh>
+#if defined(XMLTOOLING_LOG4SHIB)
+# include <log4shib/PropertyConfigurator.hh>
+# include <log4shib/OstreamAppender.hh>
+#elif defined(XMLTOOLING_LOG4CPP)
+# include <log4cpp/PropertyConfigurator.hh>
+# include <log4cpp/OstreamAppender.hh>
+#endif
#include <xercesc/util/PlatformUtils.hpp>
#ifndef XMLTOOLING_NO_XMLSEC
# include <curl/curl.h>
#endif
using namespace soap11;
-using namespace xmlencryption;
-using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
+using xercesc::XMLPlatformUtils;
+
DECL_XMLTOOLING_EXCEPTION_FACTORY(XMLParserException,xmltooling);
DECL_XMLTOOLING_EXCEPTION_FACTORY(XMLObjectException,xmltooling);
DECL_XMLTOOLING_EXCEPTION_FACTORY(MarshallingException,xmltooling);
DECL_XMLTOOLING_EXCEPTION_FACTORY(IOException,xmltooling);
#ifndef XMLTOOLING_NO_XMLSEC
+using namespace xmlencryption;
+using namespace xmlsignature;
DECL_XMLTOOLING_EXCEPTION_FACTORY(XMLSecurityException,xmltooling);
DECL_XMLTOOLING_EXCEPTION_FACTORY(SignatureException,xmlsignature);
DECL_XMLTOOLING_EXCEPTION_FACTORY(EncryptionException,xmlencryption);
else
g_openssl_locks[n]->unlock();
}
-
+
# ifndef WIN32
extern "C" unsigned long openssl_thread_id(void)
{
config=getenv("XMLTOOLING_LOG_CONFIG");
if (!config || !*config)
config="WARN";
-
+
bool level=false;
Category& root = Category::getRoot();
if (!strcmp(config,"DEBUG")) {
root.setPriority(Priority::FATAL);
level=true;
}
- if (level)
+ if (level) {
root.setAppender(new OstreamAppender("default",&cerr));
- else
- PropertyConfigurator::configure(config);
+ }
+ else {
+ string path(config);
+ PropertyConfigurator::configure(m_pathResolver ? m_pathResolver->resolve(path, PathResolver::XMLTOOLING_CFG_FILE) : path);
+ }
}
catch (const ConfigureFailure& e) {
Category::getInstance(XMLTOOLING_LOGCAT".Logging").crit("failed to initialize log4cpp: %s", e.what());
return false;
}
-
+
return true;
}
}
#endif
+void XMLToolingConfig::setPathResolver(PathResolver* pathResolver)
+{
+ delete m_pathResolver;
+ m_pathResolver = pathResolver;
+}
+
void XMLToolingConfig::setTemplateEngine(TemplateEngine* templateEngine)
{
delete m_templateEngine;
#endif
XMLPlatformUtils::Initialize();
- log.debug("Xerces initialization complete");
+ log.debug("Xerces %s initialization complete", XERCES_FULLVERSIONDOT);
#ifndef XMLTOOLING_NO_XMLSEC
XSECPlatformUtils::Initialise();
m_xsecProvider=new XSECProvider();
- log.debug("XMLSec initialization complete");
+ log.debug("XML-Security %s initialization complete", XSEC_FULLVERSIONDOT);
#endif
m_parserPool=new ParserPool();
m_validatingPool=new ParserPool(true,true);
m_lock=XMLPlatformUtils::makeMutex();
-
+
// Load catalogs from path.
if (!catalog_path.empty()) {
char* catpath=strdup(catalog_path.c_str());
// default registrations
XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
- registerKeyInfoClasses();
- registerEncryptionClasses();
registerSOAPClasses();
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(XMLParserException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(UnknownAttributeException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ValidationException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(IOException,xmltooling);
-
+
#ifndef XMLTOOLING_NO_XMLSEC
XMLObjectBuilder::registerBuilder(QName(xmlconstants::XMLSIG_NS,Signature::LOCAL_NAME),new SignatureBuilder());
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(XMLSecurityException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SignatureException,xmlsignature);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(EncryptionException,xmlencryption);
+ registerKeyInfoClasses();
+ registerEncryptionClasses();
registerKeyInfoResolvers();
registerCredentialResolvers();
registerTrustEngines();
m_keyInfoResolver = KeyInfoResolverManager.newPlugin(INLINE_KEYINFO_RESOLVER,NULL);
#endif
+ m_pathResolver = new PathResolver();
m_urlEncoder = new URLEncoder();
-
- // Register xml:id as an ID attribute.
+
+ // Register xml:id as an ID attribute.
static const XMLCh xmlid[] = UNICODE_LITERAL_2(i,d);
- AttributeExtensibleXMLObject::registerIDAttribute(QName(xmlconstants::XML_NS, xmlid));
+ AttributeExtensibleXMLObject::registerIDAttribute(QName(xmlconstants::XML_NS, xmlid));
}
catch (const xercesc::XMLException&) {
log.fatal("caught exception while initializing Xerces");
# endif
#endif
- log.info("library initialization complete");
+ log.info("%s library initialization complete", PACKAGE_STRING);
return true;
}
m_replayCache = NULL;
#endif
+ delete m_pathResolver;
+ m_pathResolver = NULL;
+
delete m_templateEngine;
m_templateEngine = NULL;
#endif
}
m_libhandles.clear();
-
+
delete m_parserPool;
m_parserPool=NULL;
delete m_validatingPool;
#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
-#endif
+#endif
#ifdef _DEBUG
xmltooling::NDC ndc("term");
#endif
- Category::getInstance(XMLTOOLING_LOGCAT".XMLToolingConfig").info("library shutdown complete");
+ Category::getInstance(XMLTOOLING_LOGCAT".XMLToolingConfig").info("%s library shutdown complete", PACKAGE_STRING);
}
Lockable* XMLToolingInternalConfig::lock()
Locker locker(this);
+ string resolved(path);
+ m_pathResolver->resolve(resolved, PathResolver::XMLTOOLING_LIB_FILE);
+
#if defined(WIN32)
HMODULE handle=NULL;
- char* fixed=const_cast<char*>(path);
- if (strchr(fixed,'/')) {
- fixed=strdup(path);
- char* p=fixed;
- while (p=strchr(p,'/'))
- *p='\\';
- }
+ for (string::iterator i = resolved.begin(); i != resolved.end(); ++i)
+ if (*i == '/')
+ *i = '\\';
UINT em=SetErrorMode(SEM_FAILCRITICALERRORS);
try {
- handle=LoadLibraryEx(fixed,NULL,LOAD_WITH_ALTERED_SEARCH_PATH);
+ handle=LoadLibraryEx(resolved.c_str(),NULL,LOAD_WITH_ALTERED_SEARCH_PATH);
if (!handle)
- handle=LoadLibraryEx(fixed,NULL,0);
+ handle=LoadLibraryEx(resolved.c_str(),NULL,0);
if (!handle)
- throw runtime_error(string("unable to load extension library: ") + fixed);
+ throw runtime_error(string("unable to load extension library: ") + resolved);
FARPROC fn=GetProcAddress(handle,"xmltooling_extension_init");
if (!fn)
- throw runtime_error(string("unable to locate xmltooling_extension_init entry point: ") + fixed);
+ throw runtime_error(string("unable to locate xmltooling_extension_init entry point: ") + resolved);
if (reinterpret_cast<int(*)(void*)>(fn)(context)!=0)
- throw runtime_error(string("detected error in xmltooling_extension_init: ") + fixed);
- if (fixed!=path)
- free(fixed);
+ throw runtime_error(string("detected error in xmltooling_extension_init: ") + resolved);
SetErrorMode(em);
}
- catch(runtime_error& e) {
- log.error(e.what());
+ catch(exception&) {
if (handle)
FreeLibrary(handle);
SetErrorMode(em);
- if (fixed!=path)
- free(fixed);
- return false;
+ throw;
}
#elif defined(HAVE_DLFCN_H)
- void* handle=dlopen(path,RTLD_LAZY);
+ void* handle=dlopen(resolved.c_str(),RTLD_LAZY);
if (!handle)
- throw runtime_error(string("unable to load extension library '") + path + "': " + dlerror());
+ throw runtime_error(string("unable to load extension library '") + resolved + "': " + dlerror());
int (*fn)(void*)=(int (*)(void*))(dlsym(handle,"xmltooling_extension_init"));
if (!fn) {
dlclose(handle);
throw runtime_error(
- string("unable to locate xmltooling_extension_init entry point in '") + path + "': " +
+ string("unable to locate xmltooling_extension_init entry point in '") + resolved + "': " +
(dlerror() ? dlerror() : "unknown error")
);
}
try {
if (fn(context)!=0)
- throw runtime_error(string("detected error in xmltooling_extension_init in ") + path);
+ throw runtime_error(string("detected error in xmltooling_extension_init in ") + resolved);
}
- catch(runtime_error& e) {
- log.error(e.what());
+ catch(exception&) {
if (handle)
dlclose(handle);
- return false;
+ throw;
}
#else
# error "Don't know about dynamic loading on this platform!"
#endif
m_libhandles.push_back(handle);
- log.info("loaded extension: %s", path);
+ log.info("loaded extension: %s", resolved.c_str());
return true;
}
unsigned long code=ERR_get_error_line_data(&file,&line,&data,&flags);
while (code) {
Category& log=Category::getInstance("OpenSSL");
- log.errorStream() << "error code: " << code << " in " << file << ", line " << line << CategoryStream::ENDLINE;
+ log.errorStream() << "error code: " << code << " in " << file << ", line " << line << logging::eol;
if (data && (flags & ERR_TXT_STRING))
- log.errorStream() << "error data: " << data << CategoryStream::ENDLINE;
+ log.errorStream() << "error data: " << data << logging::eol;
code=ERR_get_error_line_data(&file,&line,&data,&flags);
}
}
registerXMLAlgorithm(DSIGConstants::s_unicodeStrURIKW_AES256, "AES", 256);
}
#endif
+
+#ifdef WIN32
+
+extern "C" __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)
+{
+ if (fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH)
+ ThreadKey::onDetach();
+ return TRUE;
+}
+
+#endif
projects / shibboleth / cpp-xmltooling.git / blobdiff