X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FXMLMetadataProvider.cpp;h=6986b9dd0d1a041463871b3726185fc16ff32002;hp=ff9b262dc5c071d500f3cfa2e95fa246ab3d63af;hb=1462057b3b9ae7e165d34d988e30b14c213672ca;hpb=47847f1c0569480b5dbd10ae69227460e093d697 diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp index ff9b262..6986b9d 100644 --- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * 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 + * UCAID licenses this file to you 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. */ /** @@ -30,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +50,7 @@ using namespace opensaml::saml2md; using namespace xmltooling::logging; using namespace xmltooling; +using namespace boost; using namespace std; #if defined (_MSC_VER) @@ -63,34 +69,18 @@ namespace opensaml { virtual ~XMLMetadataProvider() { shutdown(); - delete m_object; } - void init() { - try { - if (!m_id.empty()) { - string threadid("["); - threadid += m_id + ']'; - logging::NDC::push(threadid); - } - background_load(); - startup(); - } - catch (...) { - startup(); - if (!m_id.empty()) { - logging::NDC::pop(); - } - throw; - } + void init(); - if (!m_id.empty()) { - logging::NDC::pop(); - } + const char* getId() const { + return m_id.c_str(); } + void outputStatus(ostream& os) const; + const XMLObject* getMetadata() const { - return m_object; + return m_object.get(); } protected: @@ -102,8 +92,8 @@ namespace opensaml { void index(time_t& validUntil); time_t computeNextRefresh(); - XMLObject* m_object; - bool m_discoveryFeed; + scoped_ptr m_object; + bool m_discoveryFeed,m_dropDOM; double m_refreshDelayFactor; unsigned int m_backoffFactor; time_t m_minRefreshDelay,m_maxRefreshDelay,m_lastValidUntil; @@ -115,8 +105,32 @@ namespace opensaml { } static const XMLCh discoveryFeed[] = UNICODE_LITERAL_13(d,i,s,c,o,v,e,r,y,F,e,e,d); + static const XMLCh dropDOM[] = UNICODE_LITERAL_7(d,r,o,p,D,O,M); static const XMLCh minRefreshDelay[] = UNICODE_LITERAL_15(m,i,n,R,e,f,r,e,s,h,D,e,l,a,y); static const XMLCh refreshDelayFactor[] = UNICODE_LITERAL_18(r,e,f,r,e,s,h,D,e,l,a,y,F,a,c,t,o,r); + + // TODO: need to move this into xmltooling as a utility function + static void xml_encode(ostream& os, const char* start) + { + size_t pos; + while (start && *start) { + pos = strcspn(start, "\"<>&"); + if (pos > 0) { + os.write(start,pos); + start += pos; + } + else { + switch (*start) { + case '"': os << """; break; + case '<': os << "<"; break; + case '>': os << ">"; break; + case '&': os << "&"; break; + default: os << *start; + } + start++; + } + } + } }; }; @@ -126,8 +140,9 @@ namespace opensaml { XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e) : MetadataProvider(e), AbstractMetadataProvider(e), DiscoverableMetadataProvider(e), - ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false), - m_object(nullptr), m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)), + ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT ".MetadataProvider.XML"), false), + m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)), + m_dropDOM(XMLHelper::getAttrBool(e, true, dropDOM)), m_refreshDelayFactor(0.75), m_backoffFactor(1), m_minRefreshDelay(XMLHelper::getAttrInt(e, 600, minRefreshDelay)), m_maxRefreshDelay(m_reloadInterval), m_lastValidUntil(SAMLTIME_MAX) @@ -150,6 +165,30 @@ XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e) } } +void XMLMetadataProvider::init() +{ + try { + if (!m_id.empty()) { + string threadid("["); + threadid += m_id + ']'; + logging::NDC::push(threadid); + } + background_load(); + startup(); + } + catch (...) { + startup(); + if (!m_id.empty()) { + logging::NDC::pop(); + } + throw; + } + + if (!m_id.empty()) { + logging::NDC::pop(); + } +} + pair XMLMetadataProvider::load(bool backup) { if (!backup) { @@ -164,7 +203,7 @@ pair XMLMetadataProvider::load(bool backup) XercesJanitor docjanitor(raw.first ? raw.second->getOwnerDocument() : nullptr); // Unmarshall objects, binding the document. - auto_ptr xmlObject(XMLObjectBuilder::buildOneFromElement(raw.second, true)); + scoped_ptr xmlObject(XMLObjectBuilder::buildOneFromElement(raw.second, true)); docjanitor.release(); if (!dynamic_cast(xmlObject.get()) && !dynamic_cast(xmlObject.get())) @@ -176,11 +215,17 @@ pair XMLMetadataProvider::load(bool backup) try { SchemaValidators.validate(xmlObject.get()); } - catch (exception& ex) { - m_log.error("metadata intance failed manual validation checking: %s", ex.what()); + catch (std::exception& ex) { + m_log.error("metadata instance failed manual validation checking: %s", ex.what()); throw MetadataException("Metadata instance failed manual validation checking."); } + const TimeBoundSAMLObject* validityCheck = dynamic_cast(xmlObject.get()); + if (!validityCheck || !validityCheck->isValid()) { + m_log.error("metadata instance was invalid at time of acquisition"); + throw MetadataException("Metadata instance was invalid at time of acquisition."); + } + // This is the best place to take a backup, since it's superficially "correct" metadata. string backupKey; if (!backup && !m_backing.empty()) { @@ -192,16 +237,16 @@ pair XMLMetadataProvider::load(bool backup) ofstream backer(backupKey.c_str()); backer << *(raw.second->getOwnerDocument()); } - catch (exception& ex) { + catch (std::exception& ex) { m_log.crit("exception while backing up metadata: %s", ex.what()); backupKey.erase(); } } try { - doFilters(*xmlObject.get()); + doFilters(*xmlObject); } - catch (exception&) { + catch (std::exception&) { if (!backupKey.empty()) remove(backupKey.c_str()); throw; @@ -216,22 +261,24 @@ pair XMLMetadataProvider::load(bool backup) preserveCacheTag(); } - xmlObject->releaseThisAndChildrenDOM(); - xmlObject->setDocument(nullptr); + if (m_dropDOM) { + xmlObject->releaseThisAndChildrenDOM(); + xmlObject->setDocument(nullptr); + } // Swap it in after acquiring write lock if necessary. if (m_lock) m_lock->wrlock(); SharedLock locker(m_lock, false); bool changed = m_object!=nullptr; - delete m_object; - m_object = xmlObject.release(); + m_object.swap(xmlObject); m_lastValidUntil = SAMLTIME_MAX; index(m_lastValidUntil); if (m_discoveryFeed) generateFeed(); if (changed) emitChangeEvent(); + m_lastUpdate = time(nullptr); // Tracking cacheUntil through the tree is TBD, but // validUntil is the tightest interval amongst the children. @@ -269,14 +316,16 @@ pair XMLMetadataProvider::background_load() return load(true); throw; } - catch (exception&) { + catch (std::exception& ex) { if (!m_local) { m_reloadInterval = m_minRefreshDelay * m_backoffFactor++; if (m_reloadInterval > m_maxRefreshDelay) m_reloadInterval = m_maxRefreshDelay; m_log.warn("adjusted reload interval to %u seconds", m_reloadInterval); - if (!m_loaded && !m_backing.empty()) + if (!m_loaded && !m_backing.empty()) { + m_log.warn("trying backup file, exception loading remote resource: %s", ex.what()); return load(true); + } } throw; } @@ -293,7 +342,7 @@ time_t XMLMetadataProvider::computeNextRefresh() else { // Compute the smaller of the validUntil / cacheDuration constraints. time_t ret = m_lastValidUntil - now; - const CacheableSAMLObject* cacheable = dynamic_cast(m_object); + const CacheableSAMLObject* cacheable = dynamic_cast(m_object.get()); if (cacheable && cacheable->getCacheDuration()) ret = min(ret, cacheable->getCacheDurationEpoch()); @@ -313,10 +362,36 @@ time_t XMLMetadataProvider::computeNextRefresh() void XMLMetadataProvider::index(time_t& validUntil) { clearDescriptorIndex(); - EntitiesDescriptor* group=dynamic_cast(m_object); + EntitiesDescriptor* group = dynamic_cast(m_object.get()); if (group) { indexGroup(group, validUntil); return; } - indexEntity(dynamic_cast(m_object), validUntil); + indexEntity(dynamic_cast(m_object.get()), validUntil); +} + +void XMLMetadataProvider::outputStatus(ostream& os) const +{ + os << " 0) { + DateTime ts(m_lastUpdate); + ts.parseDateTime(); + auto_ptr_char timestamp(ts.getFormattedString()); + os << " lastUpdate='" << timestamp.get() << "'"; + } + + if (!m_local && m_reloadInterval > 0) { + os << " reloadInterval='" << m_reloadInterval << "'"; + } + + os << "/>"; }