X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FAbstractMetadataProvider.cpp;h=fd7948c93cf2dbb133a02517ef1c5ba3662f26a2;hp=e8c7b96156b8dbcb564661d8d940da63305241d0;hb=17b312daa349580f67cc07fc190125224146cf14;hpb=8609db5e5b7aac2ce75fc2fe5fbee8b31a311735

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index e8c7b96..fd7948c 100644
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -61,7 +61,7 @@ AbstractMetadataProvider::~AbstractMetadataProvider()
     delete m_resolver;
 }
 
-void AbstractMetadataProvider::emitChangeEvent()
+void AbstractMetadataProvider::emitChangeEvent() const
 {
     for (credmap_t::iterator c = m_credentialMap.begin(); c!=m_credentialMap.end(); ++c)
         for_each(c->second.begin(), c->second.end(), xmltooling::cleanup<Credential>());
@@ -69,14 +69,27 @@ void AbstractMetadataProvider::emitChangeEvent()
     ObservableMetadataProvider::emitChangeEvent();
 }
 
-void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
+void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil, bool replace) const
 {
     if (validUntil < site->getValidUntilEpoch())
         site->setValidUntil(validUntil);
 
     auto_ptr_char id(site->getEntityID());
     if (id.get()) {
-        m_sites.insert(make_pair(id.get(),site));
+        if (replace) {
+            m_sites.erase(id.get());
+            for (sitemap_t::iterator s = m_sources.begin(); s != m_sources.end();) {
+                if (s->second == site) {
+                    sitemap_t::iterator temp = s;
+                    ++s;
+                    m_sources.erase(temp);
+                }
+                else {
+                    ++s;
+                }
+            }
+        }
+        m_sites.insert(sitemap_t::value_type(id.get(),site));
     }
     
     // Process each IdP role.
@@ -93,7 +106,7 @@ void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
                     if (sid) {
                         auto_ptr_char sourceid(sid->getID());
                         if (sourceid.get()) {
-                            m_sources.insert(pair<string,const EntityDescriptor*>(sourceid.get(),site));
+                            m_sources.insert(sitemap_t::value_type(sourceid.get(),site));
                             break;
                         }
                     }
@@ -101,37 +114,33 @@ void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
             }
             
             // Hash the ID.
-            m_sources.insert(
-                pair<string,const EntityDescriptor*>(SAMLConfig::getConfig().hashSHA1(id.get(), true),site)
-                );
+            m_sources.insert(sitemap_t::value_type(SAMLConfig::getConfig().hashSHA1(id.get(), true),site));
                 
             // Load endpoints for type 0x0002 artifacts.
             const vector<ArtifactResolutionService*>& locs=const_cast<const IDPSSODescriptor*>(*i)->getArtifactResolutionServices();
             for (vector<ArtifactResolutionService*>::const_iterator loc=locs.begin(); loc!=locs.end(); loc++) {
                 auto_ptr_char location((*loc)->getLocation());
                 if (location.get())
-                    m_sources.insert(pair<string,const EntityDescriptor*>(location.get(),site));
+                    m_sources.insert(sitemap_t::value_type(location.get(),site));
             }
         }
         
         // SAML 2.0?
         if ((*i)->hasSupport(samlconstants::SAML20P_NS)) {
             // Hash the ID.
-            m_sources.insert(
-                pair<string,const EntityDescriptor*>(SAMLConfig::getConfig().hashSHA1(id.get(), true),site)
-                );
+            m_sources.insert(sitemap_t::value_type(SAMLConfig::getConfig().hashSHA1(id.get(), true),site));
         }
     }
 }
 
-void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUntil)
+void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUntil) const
 {
     if (validUntil < group->getValidUntilEpoch())
         group->setValidUntil(validUntil);
 
     auto_ptr_char name(group->getName());
     if (name.get()) {
-        m_groups.insert(make_pair(name.get(),group));
+        m_groups.insert(groupmap_t::value_type(name.get(),group));
     }
     
     const vector<EntitiesDescriptor*>& groups=const_cast<const EntitiesDescriptor*>(group)->getEntitiesDescriptors();
@@ -143,16 +152,18 @@ void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUnti
         index(*j,group->getValidUntilEpoch());
 }
 
-void AbstractMetadataProvider::clearDescriptorIndex()
+void AbstractMetadataProvider::clearDescriptorIndex(bool freeSites)
 {
-    m_sources.clear();
+    if (freeSites)
+        for_each(m_sites.begin(), m_sites.end(), cleanup_const_pair<string,EntityDescriptor>());
     m_sites.clear();
     m_groups.clear();
+    m_sources.clear();
 }
 
 const EntitiesDescriptor* AbstractMetadataProvider::getEntitiesDescriptor(const char* name, bool strict) const
 {
-    pair<groupmap_t::const_iterator,groupmap_t::const_iterator> range=m_groups.equal_range(name);
+    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);
     for (groupmap_t::const_iterator i=range.first; i!=range.second; i++)
@@ -165,31 +176,42 @@ const EntitiesDescriptor* AbstractMetadataProvider::getEntitiesDescriptor(const
     return NULL;
 }
 
-const EntityDescriptor* AbstractMetadataProvider::getEntityDescriptor(const char* name, bool strict) const
+pair<const EntityDescriptor*,const RoleDescriptor*> AbstractMetadataProvider::getEntityDescriptor(const Criteria& criteria) const
 {
-    pair<sitemap_t::const_iterator,sitemap_t::const_iterator> range=m_sites.equal_range(name);
-
+    pair<sitemap_t::const_iterator,sitemap_t::const_iterator> range;
+    if (criteria.entityID_ascii)
+        range = const_cast<const sitemap_t&>(m_sites).equal_range(criteria.entityID_ascii);
+    else if (criteria.entityID_unicode) {
+        auto_ptr_char id(criteria.entityID_unicode);
+        range = const_cast<const sitemap_t&>(m_sites).equal_range(id.get());
+    }
+    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);
+    
+    pair<const EntityDescriptor*,const RoleDescriptor*> result;
+    result.first = NULL;
+    result.second = NULL;
+    
     time_t now=time(NULL);
-    for (sitemap_t::const_iterator i=range.first; i!=range.second; i++)
-        if (now < i->second->getValidUntilEpoch())
-            return i->second;
+    for (sitemap_t::const_iterator i=range.first; i!=range.second; i++) {
+        if (now < i->second->getValidUntilEpoch()) {
+            result.first = i->second;
+            break;
+        }
+    }
     
-    if (!strict && range.first!=range.second)
-        return range.first->second;
+    if (!result.first && !criteria.validOnly && range.first!=range.second)
+        result.first = range.first->second;
         
-    return NULL;
-}
-
-const EntityDescriptor* AbstractMetadataProvider::getEntityDescriptor(const SAMLArtifact* artifact) const
-{
-    pair<sitemap_t::const_iterator,sitemap_t::const_iterator> range=m_sources.equal_range(artifact->getSource());
-
-    time_t now=time(NULL);
-    for (sitemap_t::const_iterator i=range.first; i!=range.second; i++)
-        if (now < i->second->getValidUntilEpoch())
-            return i->second;
-
-    return NULL;
+    if (result.first && criteria.role) {
+        result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol);
+        if (!result.second && criteria.protocol2)
+            result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol2);
+    }
+    
+    return result;
 }
 
 const Credential* AbstractMetadataProvider::resolve(const CredentialCriteria* criteria) const