[cpp-xmltooling COMMIT] in /branches/REL_1/xmltooling: security/impl/FilesystemCredentialResolver.cpp security/impl/P...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  1 19:07:07 2012
New Revision: 965

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=965&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-411

Modified:
    branches/REL_1/xmltooling/security/impl/FilesystemCredentialResolver.cpp
    branches/REL_1/xmltooling/security/impl/PKIXPathValidator.cpp
    branches/REL_1/xmltooling/util/ReloadableXMLFile.cpp

Modified: branches/REL_1/xmltooling/security/impl/FilesystemCredentialResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/security/impl/FilesystemCredentialResolver.cpp?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- branches/REL_1/xmltooling/security/impl/FilesystemCredentialResolver.cpp (original)
+++ branches/REL_1/xmltooling/security/impl/FilesystemCredentialResolver.cpp Thu Mar  1 19:07:07 2012
@@ -393,7 +393,7 @@
             m_key.backing = XMLHelper::getAttrString(e, nullptr, backingFilePath);
             if (m_key.backing.empty())
                 throw XMLSecurityException("FilesystemCredentialResolver can't access key, backingFilePath missing from URL element.");
-            XMLToolingConfig::getConfig().getPathResolver()->resolve(m_key.backing, PathResolver::XMLTOOLING_RUN_FILE);
+            XMLToolingConfig::getConfig().getPathResolver()->resolve(m_key.backing, PathResolver::XMLTOOLING_CACHE_FILE);
             m_key.reloadInterval = XMLHelper::getAttrInt(e, 0, _reloadInterval);
         }
         else {
@@ -445,7 +445,7 @@
                 crl.backing = XMLHelper::getAttrString(e, nullptr, backingFilePath);
                 if (crl.backing.empty())
                     throw XMLSecurityException("FilesystemCredentialResolver can't access CRL, backingFilePath missing from URL element.");
-                XMLToolingConfig::getConfig().getPathResolver()->resolve(crl.backing, PathResolver::XMLTOOLING_RUN_FILE);
+                XMLToolingConfig::getConfig().getPathResolver()->resolve(crl.backing, PathResolver::XMLTOOLING_CACHE_FILE);
                 crl.reloadInterval = XMLHelper::getAttrInt(e, 0, _reloadInterval);
             }
             e = XMLHelper::getNextSiblingElement(e, _URL);
@@ -487,7 +487,7 @@
                 cert.backing = XMLHelper::getAttrString(e, nullptr, backingFilePath);
                 if (cert.backing.empty())
                     throw XMLSecurityException("FilesystemCredentialResolver can't access certificate, backingFilePath missing from URL element.");
-                XMLToolingConfig::getConfig().getPathResolver()->resolve(cert.backing, PathResolver::XMLTOOLING_RUN_FILE);
+                XMLToolingConfig::getConfig().getPathResolver()->resolve(cert.backing, PathResolver::XMLTOOLING_CACHE_FILE);
                 cert.reloadInterval = XMLHelper::getAttrInt(e, 0, _reloadInterval);
             }
             e = XMLHelper::getNextSiblingElement(e);

Modified: branches/REL_1/xmltooling/security/impl/PKIXPathValidator.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/security/impl/PKIXPathValidator.cpp?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- branches/REL_1/xmltooling/security/impl/PKIXPathValidator.cpp (original)
+++ branches/REL_1/xmltooling/security/impl/PKIXPathValidator.cpp Thu Mar  1 19:07:07 2012
@@ -427,7 +427,7 @@
 
     // The filenames for the CRL cache are based on a hash of the CRL location.
     string cdpfile = SecurityHelper::doHash("SHA1", cdpuri, strlen(cdpuri)) + ".crl";
-    XMLToolingConfig::getConfig().getPathResolver()->resolve(cdpfile, PathResolver::XMLTOOLING_RUN_FILE);
+    XMLToolingConfig::getConfig().getPathResolver()->resolve(cdpfile, PathResolver::XMLTOOLING_CACHE_FILE);
     string cdpstaging = cdpfile + ".tmp";
 
     time_t now = time(nullptr);

Modified: branches/REL_1/xmltooling/util/ReloadableXMLFile.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/ReloadableXMLFile.cpp?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/ReloadableXMLFile.cpp (original)
+++ branches/REL_1/xmltooling/util/ReloadableXMLFile.cpp Thu Mar  1 19:07:07 2012
@@ -189,7 +189,7 @@
             log.debug("using remote resource (%s)", m_source.c_str());
             m_backing = XMLHelper::getAttrString(e, nullptr, backingFilePath);
             if (!m_backing.empty()) {
-                XMLToolingConfig::getConfig().getPathResolver()->resolve(m_backing, PathResolver::XMLTOOLING_RUN_FILE);
+                XMLToolingConfig::getConfig().getPathResolver()->resolve(m_backing, PathResolver::XMLTOOLING_CACHE_FILE);
                 log.debug("backup remote resource to (%s)", m_backing.c_str());
                 try {
                     string tagname = m_backing + ".tag";