CPPXT-104 - Add exception handling to integer conversions

[shibboleth/cpp-xmltooling.git] / xmltooling / util / ParserPool.cpp

diff --git a/xmltooling/util/ParserPool.cpp b/xmltooling/util/ParserPool.cpp
index 42fc535..71a36f5 100644 (file)
--- a/xmltooling/util/ParserPool.cpp
+++ b/xmltooling/util/ParserPool.cpp
@@ -29,6 +29,7 @@
 #include "logging.h"
 #include "util/CurlURLInputStream.h"
 #include "util/NDC.h"
+#include "util/PathResolver.h"
 #include "util/ParserPool.h"
 #include "util/Threads.h"
 #include "util/XMLHelper.h"
@@ -39,7 +40,6 @@
 #include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
-#include <boost/tokenizer.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xercesc/sax/SAXException.hpp>
@@ -66,7 +66,7 @@ namespace {
 #ifdef _DEBUG
             xmltooling::NDC ndc("handleError");
 #endif
-            Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+            Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
 
             DOMLocator* locator=e.getLocation();
             auto_ptr_char temp(e.getMessage());
@@ -104,7 +104,17 @@ namespace {
 
 
 ParserPool::ParserPool(bool namespaceAware, bool schemaAware)
-    : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(Mutex::create()), m_security(new SecurityManager()) {}
+        : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(Mutex::create()), m_security(new SecurityManager()) {
+
+    int expLimit = 0;
+    const char* env = getenv("XMLTOOLING_ENTITY_EXPANSION_LIMIT");
+    if (env) {
+        expLimit = atoi(env);
+    }
+    if (expLimit <= 0)
+        expLimit = XMLTOOLING_ENTITY_EXPANSION_LIMIT;
+    m_security->setEntityExpansionLimit(expLimit);
+}
 
 ParserPool::~ParserPool()
 {
@@ -223,14 +233,19 @@ bool ParserPool::loadSchema(const XMLCh* nsURI, const XMLCh* pathname)
 #if _DEBUG
         xmltooling::NDC ndc("loadSchema");
 #endif
-        Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+        Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
         auto_ptr_char n(nsURI);
         log.error("failed to load schema for (%s), file not found (%s)",n.get(),p.get());
         return false;
     }
 
+    // Roundtrip to local code page and back to translate path as needed.
+    string topath(p.get());
+    XMLToolingConfig::getConfig().getPathResolver()->resolve(topath, PathResolver::XMLTOOLING_XML_FILE);
+    auto_ptr_XMLCh temp(topath.c_str());
+
     Lock lock(m_lock);
-    m_schemaLocMap[nsURI]=pathname;
+    m_schemaLocMap[nsURI] = temp.get();
     m_schemaLocations.erase();
     for_each(m_schemaLocMap.begin(), m_schemaLocMap.end(), doubleit<xstring>(m_schemaLocations,chSpace));
 
@@ -240,19 +255,19 @@ bool ParserPool::loadSchema(const XMLCh* nsURI, const XMLCh* pathname)
 bool ParserPool::loadCatalogs(const char* pathnames)
 {
     string temp(pathnames);
-    boost::tokenizer< char_separator<char> > catpaths(temp, char_separator<char>(PATH_SEPARATOR_STR));
-    for_each(
-        catpaths.begin(), catpaths.end(),
-        // Call loadCatalog with an inner call to s->c_str() on each entry.
-        boost::bind(static_cast<bool (ParserPool::*)(const char*)>(&ParserPool::loadCatalog),
-            boost::ref(this), boost::bind(&string::c_str, _1))
-        );
-    return catpaths.begin() != catpaths.end();
+    trim(temp);
+    vector<string> catpaths;
+    split(catpaths, temp, is_any_of(PATH_SEPARATOR_STR), algorithm::token_compress_on);
+    static bool (ParserPool::* lc)(const char*) = &ParserPool::loadCatalog;
+    for_each(catpaths.begin(), catpaths.end(), boost::bind(lc, this, boost::bind(&string::c_str, _1)));
+    return !catpaths.empty();
 }
 
 bool ParserPool::loadCatalog(const char* pathname)
 {
-    auto_ptr_XMLCh temp(pathname);
+    string p(pathname);
+    XMLToolingConfig::getConfig().getPathResolver()->resolve(p, PathResolver::XMLTOOLING_XML_FILE);
+    auto_ptr_XMLCh temp(p.c_str());
     return loadCatalog(temp.get());
 }
 
@@ -261,7 +276,7 @@ bool ParserPool::loadCatalog(const XMLCh* pathname)
 #if _DEBUG
     xmltooling::NDC ndc("loadCatalog");
 #endif
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+    Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
 
     // XML constants
     static const XMLCh catalog[] =  UNICODE_LITERAL_7(c,a,t,a,l,o,g);
@@ -301,13 +316,20 @@ bool ParserPool::loadCatalog(const XMLCh* pathname)
         }
 
         // Fetch all the <system> elements.
-        DOMNodeList* mappings=root->getElementsByTagNameNS(CATALOG_NS,system);
+        DOMNodeList* mappings = root->getElementsByTagNameNS(CATALOG_NS,system);
         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(nullptr,systemId);
-            const XMLCh* to=root->getAttributeNS(nullptr,uri);
-            m_schemaLocMap[from]=to;
+        for (XMLSize_t i = 0; i < mappings->getLength(); i++) {
+            root = static_cast<DOMElement*>(mappings->item(i));
+            const XMLCh* from = root->getAttributeNS(nullptr,systemId);
+            const XMLCh* to = root->getAttributeNS(nullptr,uri);
+
+            // Roundtrip to local code page and back to translate path as needed.
+            auto_ptr_char temp(to);
+            string topath(temp.get());
+            XMLToolingConfig::getConfig().getPathResolver()->resolve(topath, PathResolver::XMLTOOLING_XML_FILE);
+            auto_ptr_XMLCh temp2(topath.c_str());
+
+            m_schemaLocMap[from] = temp2.get();
         }
         m_schemaLocations.erase();
         for_each(m_schemaLocMap.begin(), m_schemaLocMap.end(), doubleit<xstring>(m_schemaLocations,chSpace));
@@ -341,7 +363,7 @@ DOMInputSource* ParserPool::resolveEntity(
         return nullptr;
     xstring sysId(systemId);
 
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+    Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
     if (log.isDebugEnabled()) {
         auto_ptr_char sysId(systemId);
         auto_ptr_char base(baseURI);
@@ -512,7 +534,7 @@ xsecsize_t StreamInputSource::StreamBinInputStream::readBytes(XMLByte* const toF
             bytes_read+=m_is.gcount();
         }
         catch(ios_base::failure& e) {
-            Category::getInstance(XMLTOOLING_LOGCAT".StreamInputSource").critStream()
+            Category::getInstance(XMLTOOLING_LOGCAT ".StreamInputSource").critStream()
                 << "XML::StreamInputSource::StreamBinInputStream::readBytes caught an exception: " << e.what()
                 << logging::eol;
             *toFill=0;