X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FChainingMetadataProvider.cpp;h=f95cfdd04216f8580c2f685b401459c3c6cc7cfc;hb=HEAD;hp=ef2a3ec0307ae186352e7849c56bd4e68fb71eb9;hpb=3458f782da3d1638b087d9e935e0d177db29d31b;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp index ef2a3ec..f95cfdd 100644 --- a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp @@ -1,17 +1,21 @@ -/* - * 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. - * You may obtain a copy of the License at +/** + * 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. + * + * 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. */ /** @@ -29,6 +33,9 @@ #include "saml2/metadata/MetadataCredentialCriteria.h" #include +#include +#include +#include #include #include #include @@ -40,6 +47,7 @@ using namespace opensaml; using namespace xmlsignature; using namespace xmltooling::logging; using namespace xmltooling; +using namespace boost; using namespace std; namespace opensaml { @@ -59,33 +67,34 @@ namespace opensaml { Lockable* lock(); void unlock(); + void setContext(const MetadataFilterContext*); void init(); + void outputStatus(ostream&) const; const XMLObject* getMetadata() const; - const EntitiesDescriptor* getEntitiesDescriptor(const char* name, bool requireValidMetadata=true) const; - pair getEntityDescriptor(const Criteria& criteria) const; + const EntitiesDescriptor* getEntitiesDescriptor(const char*, bool requireValidMetadata=true) const; + pair getEntityDescriptor(const Criteria&) const; const Credential* resolve(const CredentialCriteria* criteria=nullptr) const; - vector::size_type resolve(vector& results, const CredentialCriteria* criteria=nullptr) const; + vector::size_type resolve(vector&, const CredentialCriteria* criteria=nullptr) const; string getCacheTag() const { Lock lock(m_trackerLock); return m_feedTag; } - ostream& outputFeed(ostream& os) const { - os << "[\n"; + void outputFeed(ostream& os, bool& first, bool wrapArray=true) const { + if (wrapArray) + os << '['; // Lock each provider in turn and suck in its feed. - for (vector::const_iterator m = m_providers.begin(); m != m_providers.end(); ++m) { - if (m != m_providers.begin()) - os << ",\n"; - DiscoverableMetadataProvider* d = dynamic_cast(*m); + for (ptr_vector::iterator m = m_providers.begin(); m != m_providers.end(); ++m) { + DiscoverableMetadataProvider* d = dynamic_cast(&(*m)); if (d) { Locker locker(d); - d->outputFeed(os); + d->outputFeed(os, first, false); } } - os << ']'; - return os; + if (wrapArray) + os << "\n]"; } void onEvent(const ObservableMetadataProvider& provider) const { @@ -103,9 +112,9 @@ namespace opensaml { private: bool m_firstMatch; - mutable Mutex* m_trackerLock; - ThreadKey* m_tlsKey; - vector m_providers; + mutable auto_ptr m_trackerLock; + auto_ptr m_tlsKey; + mutable ptr_vector m_providers; mutable set m_trackers; static void tracker_cleanup(void*); Category& m_log; @@ -152,7 +161,7 @@ namespace opensaml { static const XMLCh _MetadataProvider[] = UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r); static const XMLCh precedence[] = UNICODE_LITERAL_10(p,r,e,c,e,d,e,n,c,e); static const XMLCh last[] = UNICODE_LITERAL_4(l,a,s,t); - static const XMLCh _type[] = UNICODE_LITERAL_4(t,y,p,e); + static const XMLCh _type[] = UNICODE_LITERAL_4(t,y,p,e); }; }; @@ -168,8 +177,8 @@ void ChainingMetadataProvider::tracker_cleanup(void* ptr) } ChainingMetadataProvider::ChainingMetadataProvider(const DOMElement* e) - : ObservableMetadataProvider(e), m_firstMatch(true), m_trackerLock(nullptr), m_tlsKey(nullptr), - m_log(Category::getInstance(SAML_LOGCAT".Metadata.Chaining")) + : ObservableMetadataProvider(e), m_firstMatch(true), m_trackerLock(Mutex::create()), m_tlsKey(ThreadKey::create(tracker_cleanup)), + m_log(Category::getInstance(SAML_LOGCAT ".Metadata.Chaining")) { if (XMLString::equals(e ? e->getAttributeNS(nullptr, precedence) : nullptr, last)) m_firstMatch = false; @@ -187,31 +196,35 @@ ChainingMetadataProvider::ChainingMetadataProvider(const DOMElement* e) m_providers.push_back(provider.get()); provider.release(); } - catch (exception& ex) { + catch (std::exception& ex) { m_log.error("error building MetadataProvider: %s", ex.what()); } } + else { + m_log.error("MetadataProvider element missing type attribute"); + } e = XMLHelper::getNextSiblingElement(e, _MetadataProvider); } - m_trackerLock = Mutex::create(); - m_tlsKey = ThreadKey::create(tracker_cleanup); } ChainingMetadataProvider::~ChainingMetadataProvider() { - delete m_tlsKey; - delete m_trackerLock; + m_tlsKey.reset(); // need to free this ahead of trackers in a command line case for_each(m_trackers.begin(), m_trackers.end(), xmltooling::cleanup()); - for_each(m_providers.begin(), m_providers.end(), xmltooling::cleanup()); +} + +void ChainingMetadataProvider::setContext(const MetadataFilterContext* ctx) +{ + for_each(m_providers.begin(), m_providers.end(), boost::bind(&MetadataProvider::setContext, _1, ctx)); } void ChainingMetadataProvider::init() { - for (vector::const_iterator i=m_providers.begin(); i!=m_providers.end(); ++i) { + for (ptr_vector::iterator i = m_providers.begin(); i != m_providers.end(); ++i) { try { - (*i)->init(); + i->init(); } - catch (exception& ex) { + catch (std::exception& ex) { m_log.crit("failure initializing MetadataProvider: %s", ex.what()); } } @@ -221,6 +234,11 @@ void ChainingMetadataProvider::init() m_feedTag = SAMLArtifact::toHex(m_feedTag); } +void ChainingMetadataProvider::outputStatus(ostream& os) const +{ + for_each(m_providers.begin(), m_providers.end(), boost::bind(&MetadataProvider::outputStatus, _1, boost::ref(os))); +} + Lockable* ChainingMetadataProvider::lock() { return this; // we're not lockable ourselves... @@ -232,7 +250,7 @@ void ChainingMetadataProvider::unlock() void* ptr=m_tlsKey->getData(); if (ptr) { tracker_t* t = reinterpret_cast(ptr); - for_each(t->m_locked.begin(), t->m_locked.end(), mem_fun(&Lockable::unlock)); + for_each(t->m_locked.begin(), t->m_locked.end(), mem_fun(&Lockable::unlock)); t->m_locked.clear(); t->m_objectMap.clear(); } @@ -259,13 +277,13 @@ const EntitiesDescriptor* ChainingMetadataProvider::getEntitiesDescriptor(const MetadataProvider* held = nullptr; const EntitiesDescriptor* ret = nullptr; const EntitiesDescriptor* cur = nullptr; - for (vector::const_iterator i=m_providers.begin(); i!=m_providers.end(); ++i) { - tracker->lock_if(*i); - if (cur=(*i)->getEntitiesDescriptor(name,requireValidMetadata)) { + for (ptr_vector::iterator i = m_providers.begin(); i != m_providers.end(); ++i) { + tracker->lock_if(&(*i)); + if ((cur = i->getEntitiesDescriptor(name,requireValidMetadata))) { // Are we using a first match policy? if (m_firstMatch) { // Save locked provider. - tracker->remember(*i); + tracker->remember(&(*i)); return cur; } @@ -276,12 +294,12 @@ const EntitiesDescriptor* ChainingMetadataProvider::getEntitiesDescriptor(const } // Save off the latest match. - held = *i; + held = &(*i); ret = cur; } else { // No match, so just unlock this one and move on. - tracker->unlock_if(*i); + tracker->unlock_if(&(*i)); } } @@ -308,9 +326,9 @@ pair ChainingMetadataProvider::ge MetadataProvider* held = nullptr; pair ret = pair(nullptr,nullptr); pair cur = ret; - for (vector::const_iterator i=m_providers.begin(); i!=m_providers.end(); ++i) { - tracker->lock_if(*i); - cur = (*i)->getEntityDescriptor(criteria); + for (ptr_vector::iterator i = m_providers.begin(); i != m_providers.end(); ++i) { + tracker->lock_if(&(*i)); + cur = i->getEntityDescriptor(criteria); if (cur.first) { if (criteria.role) { // We want a role also. Did we find one? @@ -321,7 +339,7 @@ pair ChainingMetadataProvider::ge if (held) tracker->unlock_if(held); // Save locked provider and role mapping. - tracker->remember(*i, cur.first); + tracker->remember(&(*i), cur.first); return cur; } @@ -347,7 +365,7 @@ pair ChainingMetadataProvider::ge } // Save off the latest match. - held = *i; + held = &(*i); ret = cur; } else { @@ -355,13 +373,13 @@ pair ChainingMetadataProvider::ge // but save this one if we didn't have the role yet. if (ret.second) { // We already had a role, so let's stick with that. - tracker->unlock_if(*i); + tracker->unlock_if(&(*i)); } else { // This is at least as good, so toss anything we had and keep it. if (held) tracker->unlock_if(held); - held = *i; + held = &(*i); ret = cur; } } @@ -374,7 +392,7 @@ pair ChainingMetadataProvider::ge tracker->unlock_if(held); // Save locked provider. - tracker->remember(*i, cur.first); + tracker->remember(&(*i), cur.first); return cur; } @@ -395,13 +413,13 @@ pair ChainingMetadataProvider::ge } // Save off the latest match. - held = *i; + held = &(*i); ret = cur; } } else { // No match, so just unlock this one and move on. - tracker->unlock_if(*i); + tracker->unlock_if(&(*i)); } }