/*
- * Copyright 2001-2009 Internet2
+ * Copyright 2001-2010 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "saml2/metadata/MetadataCredentialCriteria.h"
#include <xercesc/util/XMLUniDefs.hpp>
+#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/security/Credential.h>
#include <xmltooling/security/KeyInfoResolver.h>
#include <xmltooling/util/XMLHelper.h>
using namespace opensaml::saml2md;
+using namespace xmltooling::logging;
using namespace xmltooling;
using namespace std;
using opensaml::SAMLArtifact;
static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e);
AbstractMetadataProvider::AbstractMetadataProvider(const DOMElement* e)
- : ObservableMetadataProvider(e), m_resolver(NULL), m_credentialLock(NULL)
+ : ObservableMetadataProvider(e), m_resolver(nullptr), m_credentialLock(nullptr)
{
- e = e ? XMLHelper::getFirstChildElement(e, _KeyInfoResolver) : NULL;
+ e = e ? XMLHelper::getFirstChildElement(e, _KeyInfoResolver) : nullptr;
if (e) {
- auto_ptr_char t(e->getAttributeNS(NULL,type));
+ auto_ptr_char t(e->getAttributeNS(nullptr,type));
if (t.get())
m_resolver = XMLToolingConfig::getConfig().KeyInfoResolverManager.newPlugin(t.get(),e);
else
{
pair<groupmap_t::const_iterator,groupmap_t::const_iterator> range=const_cast<const groupmap_t&>(m_groups).equal_range(name);
- time_t now=time(NULL);
+ time_t now=time(nullptr);
for (groupmap_t::const_iterator i=range.first; i!=range.second; i++)
if (now < i->second->getValidUntilEpoch())
return i->second;
- if (!strict && range.first!=range.second)
- return range.first->second;
-
- return NULL;
+ if (range.first != range.second) {
+ Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider");
+ if (strict) {
+ log.warn("ignored expired metadata group (%s)", range.first->first.c_str());
+ }
+ else {
+ log.info("no valid metadata found, returning expired metadata group (%s)", range.first->first.c_str());
+ return range.first->second;
+ }
+ }
+
+ return nullptr;
}
pair<const EntityDescriptor*,const RoleDescriptor*> AbstractMetadataProvider::getEntityDescriptor(const Criteria& criteria) const
else if (criteria.artifact)
range = const_cast<const sitemap_t&>(m_sources).equal_range(criteria.artifact->getSource());
else
- return pair<const EntityDescriptor*,const RoleDescriptor*>(NULL,NULL);
+ return pair<const EntityDescriptor*,const RoleDescriptor*>(nullptr,nullptr);
pair<const EntityDescriptor*,const RoleDescriptor*> result;
- result.first = NULL;
- result.second = NULL;
+ result.first = nullptr;
+ result.second = nullptr;
- time_t now=time(NULL);
+ time_t now=time(nullptr);
for (sitemap_t::const_iterator i=range.first; i!=range.second; i++) {
if (now < i->second->getValidUntilEpoch()) {
result.first = i->second;
}
}
- if (!result.first && !criteria.validOnly && range.first!=range.second)
- result.first = range.first->second;
-
+ if (!result.first && range.first!=range.second) {
+ Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider");
+ if (criteria.validOnly) {
+ log.warn("ignored expired metadata instance for (%s)", range.first->first.c_str());
+ }
+ else {
+ log.info("no valid metadata found, returning expired instance for (%s)", range.first->first.c_str());
+ result.first = range.first->second;
+ }
+ }
+
if (result.first && criteria.role) {
result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol);
if (!result.second && criteria.protocol2)
for (credmap_t::mapped_type::const_iterator c = creds.begin(); c!=creds.end(); ++c)
if (metacrit->matches(*(*c)))
return *c;
- return NULL;
+ return nullptr;
}
vector<const Credential*>::size_type AbstractMetadataProvider::resolve(