X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FSignatureMetadataFilter.cpp;h=4e162cb7cbbb5a23840313276c27aa632b3a8dbc;hp=3b704663476b1d9615d1a2d6e7337a98022bebf1;hb=e654827690e0477ac0ca54e80640d81c561a6118;hpb=92522b6c6abd01b28bdd7798340a7398f237e05f

diff --git a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
index 3b70466..4e162cb 100644
--- a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2008 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,11 +71,13 @@ namespace opensaml {
 
         private:
             void doFilter(EntitiesDescriptor& entities, bool rootObject=false) const;
+            void doFilter(EntityDescriptor& entity, bool rootObject=false) const;
             void verifySignature(Signature* sig, const XMLCh* peerName) const;
             
             CredentialResolver* m_credResolver;
             SignatureTrustEngine* m_trust;
             SignatureProfileValidator m_profileValidator;
+            Category& m_log;
         }; 
 
         MetadataFilter* SAML_DLLLOCAL SignatureMetadataFilterFactory(const DOMElement* const & e)
@@ -93,7 +95,8 @@ static const XMLCh certificate[] =          UNICODE_LITERAL_11(c,e,r,t,i,f,i,c,a
 static const XMLCh Certificate[] =          UNICODE_LITERAL_11(C,e,r,t,i,f,i,c,a,t,e);
 static const XMLCh Path[] =                 UNICODE_LITERAL_4(P,a,t,h);
 
-SignatureMetadataFilter::SignatureMetadataFilter(const DOMElement* e) : m_credResolver(NULL), m_trust(NULL)
+SignatureMetadataFilter::SignatureMetadataFilter(const DOMElement* e)
+    : m_credResolver(NULL), m_trust(NULL), m_log(Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature"))
 {
     if (e && e->hasAttributeNS(NULL,certificate)) {
         // Use a file-based credential resolver rooted here.
@@ -135,23 +138,28 @@ void SignatureMetadataFilter::doFilter(XMLObject& xmlObject) const
     }
     catch (bad_cast) {
     }
+    catch (exception& ex) {
+        m_log.warn("filtering out group at root of instance after failed signature check: %s", ex.what());
+        throw MetadataFilterException("SignatureMetadataFilter unable to verify signature at root of metadata instance.");
+    }
 
     try {
         EntityDescriptor& entity = dynamic_cast<EntityDescriptor&>(xmlObject);
-        if (!entity.getSignature())
-            throw MetadataFilterException("Root metadata element was unsigned.");
-        verifySignature(entity.getSignature(), entity.getEntityID());
+        doFilter(entity, true);
+        return;
     }
     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("SignatureMetadataFilter unable to verify signature at root of metadata instance.");
+    }
      
     throw MetadataFilterException("SignatureMetadataFilter was given an improper metadata instance to filter.");
 }
 
 void SignatureMetadataFilter::doFilter(EntitiesDescriptor& entities, bool rootObject) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature");
-    
     Signature* sig = entities.getSignature();
     if (!sig && rootObject)
         throw MetadataFilterException("Root metadata element was unsigned.");
@@ -160,12 +168,12 @@ void SignatureMetadataFilter::doFilter(EntitiesDescriptor& entities, bool rootOb
     VectorOf(EntityDescriptor) v=entities.getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i=0; i<v.size(); ) {
         try {
-            verifySignature(v[i]->getSignature(), v[i]->getEntityID());
+            doFilter(*(v[i]));
             i++;
         }
         catch (exception& e) {
             auto_ptr_char id(v[i]->getEntityID());
-            log.info("filtering out entity (%s) after failed signature check: ", id.get(), e.what());
+            m_log.warn("filtering out entity (%s) after failed signature check: %s", id.get(), e.what());
             v.erase(v.begin() + i);
         }
     }
@@ -173,17 +181,52 @@ void SignatureMetadataFilter::doFilter(EntitiesDescriptor& entities, bool rootOb
     VectorOf(EntitiesDescriptor) w=entities.getEntitiesDescriptors();
     for (VectorOf(EntitiesDescriptor)::size_type j=0; j<w.size(); ) {
         try {
-            verifySignature(w[j]->getSignature(), w[j]->getName());
+            doFilter(*w[j], false);
             j++;
         }
         catch (exception& e) {
             auto_ptr_char name(w[j]->getName());
-            log.info("filtering out group (%s) after failed signature check: ", name.get(), e.what());
+            m_log.warn("filtering out group (%s) after failed signature check: %s", name.get(), e.what());
             w.erase(w.begin() + j);
         }
     }
 }
 
+void SignatureMetadataFilter::doFilter(EntityDescriptor& entity, bool rootObject) const
+{
+    Signature* sig = entity.getSignature();
+    if (!sig && rootObject)
+        throw MetadataFilterException("Root metadata element was unsigned.");
+    verifySignature(sig, entity.getEntityID());
+    
+    VectorOf(RoleDescriptor) v=entity.getRoleDescriptors();
+    for (VectorOf(RoleDescriptor)::size_type i=0; i<v.size(); ) {
+        try {
+            verifySignature(v[i]->getSignature(), entity.getEntityID());
+            i++;
+        }
+        catch (exception& e) {
+            auto_ptr_char id(entity.getEntityID());
+            m_log.warn(
+                "filtering out role (%s) for entity (%s) after failed signature check: %s",
+                v[i]->getElementQName().toString().c_str(), id.get(), e.what()
+                );
+            v.erase(v.begin() + i);
+        }
+    }
+
+    if (entity.getAffiliationDescriptor()) {
+        try {
+            verifySignature(entity.getAffiliationDescriptor()->getSignature(), entity.getEntityID());
+        }
+        catch (exception& e) {
+            auto_ptr_char id(entity.getEntityID());
+            m_log.warn("filtering out affiliation from entity (%s) after failed signature check: %s", id.get(), e.what());
+            entity.setAffiliationDescriptor(NULL);
+        }
+    }
+}
+
 void SignatureMetadataFilter::verifySignature(Signature* sig, const XMLCh* peerName) const
 {
     if (!sig)
@@ -193,7 +236,7 @@ void SignatureMetadataFilter::verifySignature(Signature* sig, const XMLCh* peerN
 
     // Set up criteria.
     CredentialCriteria cc;
-    cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+    cc.setUsage(Credential::SIGNING_CREDENTIAL);
     cc.setSignature(*sig, CredentialCriteria::KEYINFO_EXTRACTION_KEY);
     if (peerName) {
         auto_ptr_char pname(peerName);
@@ -217,7 +260,7 @@ void SignatureMetadataFilter::verifySignature(Signature* sig, const XMLCh* peerN
             throw MetadataFilterException("CredentialResolver did not supply a successful verification key.");
         }
         else {
-            throw MetadataFilterException("CredentialResolver did not supply any verification keys.");
+            throw MetadataFilterException("CredentialResolver did not supply a successful verification key.");
         }
     }
     else if (m_trust) {