/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
using namespace log4cpp;
ParserPool::ParserPool(bool namespaceAware, bool schemaAware)
- : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(XMLPlatformUtils::makeMutex()) {}
+ : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(Mutex::create()) {}
ParserPool::~ParserPool()
{
m_pool.top()->release();
m_pool.pop();
}
- XMLPlatformUtils::closeMutex(m_lock);
+ delete m_lock;
}
DOMDocument* ParserPool::newDocument()
DOMDocument* ParserPool::parse(DOMInputSource& domsrc)
{
DOMBuilder* parser=checkoutBuilder();
+ XercesJanitor<DOMBuilder> janitor(parser);
try {
DOMDocument* doc=parser->parse(domsrc);
parser->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument,true);
- checkinBuilder(parser);
+ checkinBuilder(janitor.release());
return doc;
}
- catch (...) {
- checkinBuilder(parser);
+ catch (XMLException&) {
+ checkinBuilder(janitor.release());
+ throw;
+ }
+ catch (XMLToolingException&) {
+ checkinBuilder(janitor.release());
throw;
}
}
return false;
}
- XMLPlatformUtils::lockMutex(m_lock);
+ Lock lock(m_lock);
#ifdef HAVE_GOOD_STL
m_schemaLocMap[nsURI]=pathname;
m_schemaLocations.erase();
m_schemaLocations.erase();
for_each(m_schemaLocMap.begin(),m_schemaLocMap.end(),doubleit<string>(m_schemaLocations,' '));
#endif
- XMLPlatformUtils::unlockMutex(m_lock);
return true;
}
LocalFileInputSource fsrc(NULL,pathname);
Wrapper4InputSource domsrc(&fsrc,false);
try {
- DOMDocument* doc=XMLToolingInternalConfig::getInternalConfig().m_parserPool->parse(domsrc);
+ DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(domsrc);
+ XercesJanitor<DOMDocument> janitor(doc);
// Check root element.
const DOMElement* root=doc->getDocumentElement();
if (!XMLHelper::isNodeNamed(root,CATALOG_NS,catalog)) {
auto_ptr_char temp(pathname);
log.error("unknown root element, failed to load XML catalog from %s", temp.get());
- doc->release();
return false;
}
// Fetch all the <uri> elements.
DOMNodeList* mappings=root->getElementsByTagNameNS(CATALOG_NS,uri);
- XMLPlatformUtils::lockMutex(m_lock);
+ Lock lock(m_lock);
for (XMLSize_t i=0; i<mappings->getLength(); i++) {
root=static_cast<DOMElement*>(mappings->item(i));
const XMLCh* from=root->getAttributeNS(NULL,name);
#else
for_each(m_schemaLocMap.begin(),m_schemaLocMap.end(),doubleit<string>(m_schemaLocations,' '));
#endif
- XMLPlatformUtils::unlockMutex(m_lock);
- doc->release();
}
catch (XMLParserException& e) {
log.error("catalog loader caught XMLParserException: %s", e.what());
log.debug("asked to resolve %s with baseURI %s",sysId.get(),base.get() ? base.get() : "(null)");
}
- // Find well-known schemas in the specified location.
#ifdef HAVE_GOOD_STL
+ // Find well-known schemas in the specified location.
map<xstring,xstring>::const_iterator i=m_schemaLocMap.find(systemId);
if (i!=m_schemaLocMap.end())
- return new Wrapper4InputSource(new LocalFileInputSource(NULL,i->second.c_str()));
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,i->second.c_str()));
+
+ // We'll allow anything without embedded slashes.
+ if (XMLString::indexOf(systemId, chForwardSlash)==-1)
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,systemId));
+
+ // Check for entity as a value in the map.
+ for (i=m_schemaLocMap.begin(); i!=m_schemaLocMap.end(); ++i) {
+ if (XMLString::endsWith(i->second.c_str(), systemId))
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,i->second.c_str()));
+ }
#else
+ // Find well-known schemas in the specified location.
auto_ptr_char temp(systemId);
map<string,string>::const_iterator i=m_schemaLocMap.find(temp.get());
- auto_ptr_XMLCh temp2(i->second.c_str());
- if (i!=m_schemaLocMap.end())
- return new Wrapper4InputSource(new LocalFileInputSource(NULL,temp2.get()));
+ if (i!=m_schemaLocMap.end()) {
+ auto_ptr_XMLCh temp2(i->second.c_str());
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,temp2.get()));
+ }
+
+ // We'll allow anything without embedded slashes.
+ if (XMLString::indexOf(systemId, chForwardSlash)==-1)
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,systemId));
+
+ // Check for entity as a value in the map.
+ for (i=m_schemaLocMap.begin(); i!=m_schemaLocMap.end(); ++i) {
+ if (XMLString::endsWith(i->second.c_str(), temp.get())) {
+ auto_ptr_XMLCh temp2(i->second.c_str());
+ return new Wrapper4InputSource(new LocalFileInputSource(baseURI,temp2.get()));
+ }
+ }
#endif
// Shortcircuit the request.
- log.warn("unauthorized entity request, blocking it");
+#ifdef HAVE_GOOD_STL
+ auto_ptr_char temp(systemId);
+#endif
+ log.warn("unauthorized entity request (%s), blocking it", temp.get());
static const XMLByte nullbuf[] = {0};
return new Wrapper4InputSource(new MemBufInputSource(nullbuf,0,systemId));
}
DOMBuilder* ParserPool::checkoutBuilder()
{
- XMLPlatformUtils::lockMutex(m_lock);
- try {
- if (m_pool.empty()) {
- DOMBuilder* builder=createBuilder();
- XMLPlatformUtils::unlockMutex(m_lock);
- return builder;
- }
- DOMBuilder* p=m_pool.top();
- m_pool.pop();
- if (m_schemaAware) {
+ Lock lock(m_lock);
+ if (m_pool.empty()) {
+ DOMBuilder* builder=createBuilder();
+ return builder;
+ }
+ DOMBuilder* p=m_pool.top();
+ m_pool.pop();
+ if (m_schemaAware) {
#ifdef HAVE_GOOD_STL
- p->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation,const_cast<XMLCh*>(m_schemaLocations.c_str()));
+ p->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation,const_cast<XMLCh*>(m_schemaLocations.c_str()));
#else
- auto_ptr_XMLCh temp2(m_schemaLocations.c_str());
- p->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation,const_cast<XMLCh*>(temp2.get()));
+ auto_ptr_XMLCh temp2(m_schemaLocations.c_str());
+ p->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation,const_cast<XMLCh*>(temp2.get()));
#endif
- }
- XMLPlatformUtils::unlockMutex(m_lock);
- return p;
- }
- catch(...) {
- XMLPlatformUtils::unlockMutex(m_lock);
- throw;
}
+ return p;
}
void ParserPool::checkinBuilder(DOMBuilder* builder)
{
if (builder) {
- XMLPlatformUtils::lockMutex(m_lock);
+ Lock lock(m_lock);
m_pool.push(builder);
- XMLPlatformUtils::unlockMutex(m_lock);
}
}
unsigned int bytes_read=0,request=maxToRead;
// Fulfill the rest by reading from the stream.
- if (request && !m_is.eof()) {
+ if (request && !m_is.eof() && !m_is.fail()) {
try {
m_is.read(reinterpret_cast<char* const>(target),request);
m_pos+=m_is.gcount();
bytes_read+=m_is.gcount();
}
- catch(...) {
- Category::getInstance(XMLTOOLING_LOGCAT".StreamInputSource").critStream() <<
- "XML::StreamInputSource::StreamBinInputStream::readBytes caught an exception" << CategoryStream::ENDLINE;
+ catch(ios_base::failure& e) {
+ Category::getInstance(XMLTOOLING_LOGCAT".StreamInputSource").critStream()
+ << "XML::StreamInputSource::StreamBinInputStream::readBytes caught an exception: " << e.what()
+ << CategoryStream::ENDLINE;
*toFill=0;
return 0;
}
projects / shibboleth / cpp-xmltooling.git / blobdiff