#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataFilter.h"
#include "saml2/metadata/AbstractMetadataProvider.h"
+#include "saml2/metadata/DiscoverableMetadataProvider.h"
#include <fstream>
+#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/PathResolver.h>
#include <xmltooling/util/ReloadableXMLFile.h>
#include <xmltooling/util/Threads.h>
#include <xmltooling/validation/ValidatorSuite.h>
namespace opensaml {
namespace saml2md {
- 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);
-
- class SAML_DLLLOCAL XMLMetadataProvider : public AbstractMetadataProvider, public ReloadableXMLFile
+ class SAML_DLLLOCAL XMLMetadataProvider
+ : public AbstractMetadataProvider, public DiscoverableMetadataProvider, public ReloadableXMLFile
{
public:
XMLMetadataProvider(const DOMElement* e);
}
void init() {
- background_load();
- startup();
+ try {
+ background_load();
+ startup();
+ }
+ catch (...) {
+ startup();
+ throw;
+ }
}
const XMLObject* getMetadata() const {
time_t computeNextRefresh();
XMLObject* m_object;
+ bool m_discoveryFeed;
double m_refreshDelayFactor;
unsigned int m_backoffFactor;
time_t m_minRefreshDelay,m_maxRefreshDelay,m_lastValidUntil;
return new XMLMetadataProvider(e);
}
+ static const XMLCh discoveryFeed[] = UNICODE_LITERAL_13(d,i,s,c,o,v,e,r,y,F,e,e,d);
+ 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);
};
};
XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e)
: AbstractMetadataProvider(e), ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false),
- m_object(nullptr), m_refreshDelayFactor(0.75), m_backoffFactor(1), m_minRefreshDelay(600),
+ m_object(nullptr), m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)),
+ m_refreshDelayFactor(0.75), m_backoffFactor(1),
+ m_minRefreshDelay(XMLHelper::getAttrInt(e, 600, minRefreshDelay)),
m_maxRefreshDelay(m_reloadInterval), m_lastValidUntil(SAMLTIME_MAX)
{
if (!m_local && m_maxRefreshDelay) {
- const XMLCh* setting = e ? e->getAttributeNS(nullptr, refreshDelayFactor) : NULL;
+ const XMLCh* setting = e->getAttributeNS(nullptr, refreshDelayFactor);
if (setting && *setting) {
auto_ptr_char delay(setting);
m_refreshDelayFactor = atof(delay.get());
m_refreshDelayFactor = 0.75;
}
}
- setting = e ? e->getAttributeNS(nullptr, minRefreshDelay) : NULL;
- if (setting && *setting) {
- m_minRefreshDelay = XMLString::parseInt(setting);
- if (m_minRefreshDelay == 0) {
- m_log.error("invalid minRefreshDelay setting, using default");
- m_minRefreshDelay = 600;
- }
- else if (m_minRefreshDelay > m_maxRefreshDelay) {
- m_log.error("minRefreshDelay setting exceeds maxRefreshDelay/refreshInterval setting, lowering to match it");
- m_minRefreshDelay = m_maxRefreshDelay;
- }
+
+ if (m_minRefreshDelay > m_maxRefreshDelay) {
+ m_log.error("minRefreshDelay setting exceeds maxRefreshDelay/refreshInterval setting, lowering to match it");
+ m_minRefreshDelay = m_maxRefreshDelay;
}
}
}
remove(m_backing.c_str());
if (rename(backupKey.c_str(), m_backing.c_str()) != 0)
m_log.crit("unable to rename metadata backup file");
+ preserveCacheTag();
}
xmlObject->releaseThisAndChildrenDOM();
m_object = xmlObject.release();
m_lastValidUntil = SAMLTIME_MAX;
index(m_lastValidUntil);
+ if (m_discoveryFeed)
+ generateFeed();
if (changed)
emitChangeEvent();
// validUntil is the tightest interval amongst the children.
// If a remote resource, adjust the reload interval.
- if (!backup) {
+ if (!backup && !m_local) {
m_backoffFactor = 1;
m_reloadInterval = computeNextRefresh();
m_log.info("adjusted reload interval to %d seconds", m_reloadInterval);
if (ex == HTTPResponse::XMLTOOLING_HTTP_STATUS_NOTMODIFIED) {
// Unchanged document, so re-establish previous refresh interval.
m_reloadInterval = computeNextRefresh();
- m_log.info("adjusted reload interval to %d seconds", m_reloadInterval);
+ m_log.info("remote resource (%s) unchanged, adjusted reload interval to %u seconds", m_source.c_str(), m_reloadInterval);
}
else {
// Any other status code, just treat as an error.
m_reloadInterval = m_minRefreshDelay * m_backoffFactor++;
if (m_reloadInterval > m_maxRefreshDelay)
m_reloadInterval = m_maxRefreshDelay;
- m_log.warn("adjusted reload interval to %d seconds", m_reloadInterval);
+ m_log.warn("adjusted reload interval to %u seconds", m_reloadInterval);
}
if (!m_loaded && !m_backing.empty())
return load(true);
throw;
}
catch (exception&) {
- m_reloadInterval = m_minRefreshDelay * m_backoffFactor++;
- if (m_reloadInterval > m_maxRefreshDelay)
- m_reloadInterval = m_maxRefreshDelay;
- m_log.warn("adjusted reload interval to %d seconds", m_reloadInterval);
- if (!m_loaded && !m_backing.empty())
- return load(true);
+ 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())
+ return load(true);
+ }
throw;
}
}
-void XMLMetadataProvider::index(time_t& validUntil)
-{
- clearDescriptorIndex();
- EntitiesDescriptor* group=dynamic_cast<EntitiesDescriptor*>(m_object);
- if (group) {
- indexGroup(group, validUntil);
- return;
- }
- indexEntity(dynamic_cast<EntityDescriptor*>(m_object), validUntil);
-}
-
time_t XMLMetadataProvider::computeNextRefresh()
{
time_t now = time(nullptr);
return ret;
}
}
+
+void XMLMetadataProvider::index(time_t& validUntil)
+{
+ clearDescriptorIndex();
+ EntitiesDescriptor* group=dynamic_cast<EntitiesDescriptor*>(m_object);
+ if (group) {
+ indexGroup(group, validUntil);
+ return;
+ }
+ indexEntity(dynamic_cast<EntityDescriptor*>(m_object), validUntil);
+}
projects / shibboleth / cpp-opensaml.git / blobdiff