#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataFilter.h"
+#include <boost/ptr_container/ptr_set.hpp>
#include <xmltooling/logging.h>
#include <xmltooling/util/NDC.h>
using namespace opensaml::saml2md;
using namespace xmltooling::logging;
using namespace xmltooling;
+using namespace boost;
using namespace std;
namespace opensaml {
void doFilter(EntitiesDescriptor& entities) const;
bool m_removeRolelessEntityDescriptors, m_removeEmptyEntitiesDescriptors;
- set<xmltooling::QName> m_roles;
+ ptr_set<xmltooling::QName> m_roles;
bool m_idp, m_sp, m_authn, m_attr, m_pdp, m_authnq, m_attrq, m_authzq;
};
else if (*q == AuthzDecisionQueryDescriptorType::TYPE_QNAME)
m_authzq = true;
else
- m_roles.insert(*q.get());
+ m_roles.insert(q);
}
e = XMLHelper::getNextSiblingElement(e, RetainedRole);
}
doFilter(dynamic_cast<EntitiesDescriptor&>(xmlObject));
return;
}
- catch (bad_cast) {
+ catch (bad_cast&) {
}
try {
doFilter(dynamic_cast<EntityDescriptor&>(xmlObject));
return;
}
- catch (bad_cast) {
+ catch (bad_cast&) {
}
throw MetadataFilterException("EntityRoleWhiteList MetadataFilter was given an improper metadata instance to filter.");
{
Category& log=Category::getInstance(SAML_LOGCAT".MetadataFilter.EntityRoleWhiteList");
- VectorOf(EntityDescriptor) v=entities.getEntityDescriptors();
- for (VectorOf(EntityDescriptor)::size_type i=0; i<v.size(); ) {
+ VectorOf(EntityDescriptor) v = entities.getEntityDescriptors();
+ for (VectorOf(EntityDescriptor)::size_type i = 0; i < v.size(); ) {
doFilter(*v[i]);
if (m_removeRolelessEntityDescriptors) {
const EntityDescriptor& e = const_cast<const EntityDescriptor&>(*v[i]);
i++;
}
- VectorOf(EntitiesDescriptor) groups=entities.getEntitiesDescriptors();
- for (VectorOf(EntitiesDescriptor)::size_type j=0; j<groups.size(); ) {
+ VectorOf(EntitiesDescriptor) groups = entities.getEntitiesDescriptors();
+ for (VectorOf(EntitiesDescriptor)::size_type j = 0; j < groups.size(); ) {
EntitiesDescriptor* group = groups[j];
doFilter(*group);
if (m_removeEmptyEntitiesDescriptors && group->getEntitiesDescriptors().empty() && group->getEntityDescriptors().empty()) {
entity.getAuthzDecisionQueryDescriptorTypes().clear();
VectorOf(RoleDescriptor) v = entity.getRoleDescriptors();
- for (VectorOf(RoleDescriptor)::size_type i=0; i<v.size(); ) {
+ for (VectorOf(RoleDescriptor)::size_type i = 0; i < v.size(); ) {
const xmltooling::QName* type = v[i]->getSchemaType();
if (!type || m_roles.find(*type) != m_roles.end())
v.erase(v.begin() + i);
#include "saml2/metadata/MetadataProvider.h"
#include <algorithm>
+#include <boost/lambda/lambda.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xmltooling/logging.h>
#include <xmltooling/unicode.h>
using namespace opensaml;
using namespace xmltooling::logging;
using namespace xmltooling;
+using namespace boost::lambda;
+using namespace boost;
using namespace std;
namespace opensaml {
}
catch (XMLToolingException& ex) {
log.error("caught exception while installing filters: %s", ex.what());
- for_each(m_filters.begin(),m_filters.end(),xmltooling::cleanup<MetadataFilter>());
throw;
}
}
MetadataProvider::~MetadataProvider()
{
- for_each(m_filters.begin(), m_filters.end(), xmltooling::cleanup<MetadataFilter>());
}
const char* MetadataProvider::getId() const
MetadataFilter* MetadataProvider::removeMetadataFilter(MetadataFilter* oldFilter)
{
- for (vector<MetadataFilter*>::iterator i=m_filters.begin(); i!=m_filters.end(); i++) {
- if (oldFilter==(*i)) {
- m_filters.erase(i);
- return oldFilter;
- }
+ ptr_vector<MetadataFilter>::iterator i = find_if(m_filters.begin(), m_filters.end(), (&_1 == oldFilter));
+ if (i != m_filters.end()) {
+ return m_filters.release(i).release();
}
return nullptr;
}
NDC ndc("doFilters");
#endif
Category& log=Category::getInstance(SAML_LOGCAT".Metadata");
- for (std::vector<MetadataFilter*>::const_iterator i=m_filters.begin(); i!=m_filters.end(); i++) {
- log.info("applying metadata filter (%s)", (*i)->getId());
- (*i)->doFilter(xmlObject);
+ for (ptr_vector<MetadataFilter>::const_iterator i = m_filters.begin(); i != m_filters.end(); i++) {
+ log.info("applying metadata filter (%s)", i->getId());
+ i->doFilter(xmlObject);
}
}
namespace opensaml {
namespace saml2md {
- class SAML_DLLLOCAL DummyCredentialResolver : public CredentialResolver
- {
- public:
- DummyCredentialResolver() {}
- ~DummyCredentialResolver() {}
-
- Lockable* lock() {return this;}
- void unlock() {}
-
- const Credential* resolve(const CredentialCriteria* criteria=nullptr) const {return nullptr;}
- vector<const Credential*>::size_type resolve(
- vector<const Credential*>& results, const CredentialCriteria* criteria=nullptr
- ) const {return 0;}
- };
-
class SAML_DLLLOCAL SignatureMetadataFilter : public MetadataFilter
{
public:
SignatureMetadataFilter(const DOMElement* e);
- ~SignatureMetadataFilter() {
- delete m_credResolver;
- delete m_trust;
- }
+ ~SignatureMetadataFilter() {}
const char* getId() const { return SIGNATURE_METADATA_FILTER; }
void doFilter(XMLObject& xmlObject) const;
void verifySignature(Signature* sig, const XMLCh* peerName) const;
bool m_verifyRoles,m_verifyName;
- CredentialResolver* m_credResolver;
- SignatureTrustEngine* m_trust;
+ auto_ptr<CredentialResolver> m_credResolver,m_dummyResolver;
+ auto_ptr<SignatureTrustEngine> m_trust;
SignatureProfileValidator m_profileValidator;
Category& m_log;
};
SignatureMetadataFilter::SignatureMetadataFilter(const DOMElement* e)
: m_verifyRoles(XMLHelper::getAttrBool(e, false, verifyRoles)),
m_verifyName(XMLHelper::getAttrBool(e, true, verifyName)),
- m_credResolver(nullptr), m_trust(nullptr),
m_log(Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature"))
{
if (e && e->hasAttributeNS(nullptr,certificate)) {
// Use a file-based credential resolver rooted here.
- m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER, e);
+ m_credResolver.reset(XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER, e));
return;
}
if (sub) {
string t = XMLHelper::getAttrString(sub, nullptr, type);
if (!t.empty()) {
- m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.c_str(), sub);
+ m_credResolver.reset(XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.c_str(), sub));
return;
}
}
string t = XMLHelper::getAttrString(sub, nullptr, type);
if (!t.empty()) {
TrustEngine* trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(t.c_str(), sub);
- if (!(m_trust = dynamic_cast<SignatureTrustEngine*>(trust))) {
+ SignatureTrustEngine* sigTrust = dynamic_cast<SignatureTrustEngine*>(trust);
+ if (!sigTrust) {
delete trust;
throw MetadataFilterException("TrustEngine-based SignatureMetadataFilter requires a SignatureTrustEngine plugin.");
}
+ m_trust.reset(sigTrust);
+ m_dummyResolver.reset(XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(DUMMY_CREDENTIAL_RESOLVER, nullptr));
+ if (!m_dummyResolver.get())
+ throw MetadataFilterException("Error creating dummy CredentialResolver.");
return;
}
}
doFilter(entities, true);
return;
}
- catch (bad_cast) {
+ catch (bad_cast&) {
}
catch (exception& ex) {
m_log.warn("filtering out group at root of instance after failed signature check: %s", ex.what());
doFilter(entity, true);
return;
}
- catch (bad_cast) {
+ catch (bad_cast&) {
}
catch (exception& ex) {
m_log.warn("filtering out entity at root of instance after failed signature check: %s", ex.what());
throw MetadataFilterException("Root metadata element was unsigned.");
verifySignature(sig, entities.getName());
- VectorOf(EntityDescriptor) v=entities.getEntityDescriptors();
- for (VectorOf(EntityDescriptor)::size_type i=0; i<v.size(); ) {
+ VectorOf(EntityDescriptor) v = entities.getEntityDescriptors();
+ for (VectorOf(EntityDescriptor)::size_type i = 0; i < v.size(); ) {
try {
doFilter(*(v[i]));
i++;
}
}
- VectorOf(EntitiesDescriptor) w=entities.getEntitiesDescriptors();
- for (VectorOf(EntitiesDescriptor)::size_type j=0; j<w.size(); ) {
+ VectorOf(EntitiesDescriptor) w = entities.getEntitiesDescriptors();
+ for (VectorOf(EntitiesDescriptor)::size_type j = 0; j < w.size(); ) {
try {
doFilter(*w[j], false);
j++;
if (!m_verifyRoles)
return;
- VectorOf(IDPSSODescriptor) idp=entity.getIDPSSODescriptors();
- for (VectorOf(IDPSSODescriptor)::size_type i=0; i<idp.size(); ) {
+ VectorOf(IDPSSODescriptor) idp = entity.getIDPSSODescriptors();
+ for (VectorOf(IDPSSODescriptor)::size_type i = 0; i < idp.size(); ) {
try {
verifySignature(idp[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(SPSSODescriptor) sp=entity.getSPSSODescriptors();
- for (VectorOf(SPSSODescriptor)::size_type i=0; i<sp.size(); ) {
+ VectorOf(SPSSODescriptor) sp = entity.getSPSSODescriptors();
+ for (VectorOf(SPSSODescriptor)::size_type i = 0; i < sp.size(); ) {
try {
verifySignature(sp[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(AuthnAuthorityDescriptor) authn=entity.getAuthnAuthorityDescriptors();
- for (VectorOf(AuthnAuthorityDescriptor)::size_type i=0; i<authn.size(); ) {
+ VectorOf(AuthnAuthorityDescriptor) authn = entity.getAuthnAuthorityDescriptors();
+ for (VectorOf(AuthnAuthorityDescriptor)::size_type i = 0; i < authn.size(); ) {
try {
verifySignature(authn[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(AttributeAuthorityDescriptor) aa=entity.getAttributeAuthorityDescriptors();
- for (VectorOf(AttributeAuthorityDescriptor)::size_type i=0; i<aa.size(); ) {
+ VectorOf(AttributeAuthorityDescriptor) aa = entity.getAttributeAuthorityDescriptors();
+ for (VectorOf(AttributeAuthorityDescriptor)::size_type i = 0; i < aa.size(); ) {
try {
verifySignature(aa[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(PDPDescriptor) pdp=entity.getPDPDescriptors();
- for (VectorOf(AuthnAuthorityDescriptor)::size_type i=0; i<pdp.size(); ) {
+ VectorOf(PDPDescriptor) pdp = entity.getPDPDescriptors();
+ for (VectorOf(AuthnAuthorityDescriptor)::size_type i = 0; i < pdp.size(); ) {
try {
verifySignature(pdp[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(AuthnQueryDescriptorType) authnq=entity.getAuthnQueryDescriptorTypes();
- for (VectorOf(AuthnQueryDescriptorType)::size_type i=0; i<authnq.size(); ) {
+ VectorOf(AuthnQueryDescriptorType) authnq = entity.getAuthnQueryDescriptorTypes();
+ for (VectorOf(AuthnQueryDescriptorType)::size_type i = 0; i < authnq.size(); ) {
try {
verifySignature(authnq[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(AttributeQueryDescriptorType) attrq=entity.getAttributeQueryDescriptorTypes();
- for (VectorOf(AttributeQueryDescriptorType)::size_type i=0; i<attrq.size(); ) {
+ VectorOf(AttributeQueryDescriptorType) attrq = entity.getAttributeQueryDescriptorTypes();
+ for (VectorOf(AttributeQueryDescriptorType)::size_type i = 0; i < attrq.size(); ) {
try {
verifySignature(attrq[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(AuthzDecisionQueryDescriptorType) authzq=entity.getAuthzDecisionQueryDescriptorTypes();
- for (VectorOf(AuthzDecisionQueryDescriptorType)::size_type i=0; i<authzq.size(); ) {
+ VectorOf(AuthzDecisionQueryDescriptorType) authzq = entity.getAuthzDecisionQueryDescriptorTypes();
+ for (VectorOf(AuthzDecisionQueryDescriptorType)::size_type i = 0; i < authzq.size(); ) {
try {
verifySignature(authzq[i]->getSignature(), entity.getEntityID());
i++;
}
}
- VectorOf(RoleDescriptor) v=entity.getRoleDescriptors();
- for (VectorOf(RoleDescriptor)::size_type i=0; i<v.size(); ) {
+ VectorOf(RoleDescriptor) v = entity.getRoleDescriptors();
+ for (VectorOf(RoleDescriptor)::size_type i = 0; i < v.size(); ) {
try {
verifySignature(v[i]->getSignature(), entity.getEntityID());
i++;
cc.setUsage(Credential::SIGNING_CREDENTIAL);
cc.setSignature(*sig, CredentialCriteria::KEYINFO_EXTRACTION_KEY);
- if (m_credResolver) {
+ if (m_credResolver.get()) {
if (peerName) {
auto_ptr_char pname(peerName);
cc.setPeerName(pname.get());
}
- Locker locker(m_credResolver);
+ Locker locker(m_credResolver.get());
vector<const Credential*> creds;
if (m_credResolver->resolve(creds,&cc)) {
SignatureValidator sigValidator;
throw MetadataFilterException("CredentialResolver did not supply any candidate keys.");
}
}
- else if (m_trust) {
+ else if (m_trust.get()) {
if (m_verifyName && peerName) {
auto_ptr_char pname(peerName);
cc.setPeerName(pname.get());
}
- DummyCredentialResolver dummy;
- if (m_trust->validate(*sig, dummy, &cc))
+ if (m_trust->validate(*sig, *m_dummyResolver, &cc))
return;
throw MetadataFilterException("TrustEngine unable to verify signature.");
}