CredentialResolver* m_credResolver;
SignatureTrustEngine* m_trust;
SignatureProfileValidator m_profileValidator;
+ Category& m_log;
};
MetadataFilter* SAML_DLLLOCAL SignatureMetadataFilterFactory(const DOMElement* const & e)
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.
}
catch (bad_cast) {
}
+ catch (exception& ex) {
+ m_log.warn("filtering out group at root of instance after failed signature check: ", 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());
+ return;
}
catch (bad_cast) {
}
+ catch (exception& ex) {
+ m_log.warn("filtering out entity at root of instance after failed signature check: ", 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.");
}
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: ", id.get(), e.what());
v.erase(v.begin() + i);
}
}
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: ", name.get(), e.what());
w.erase(w.begin() + j);
}
}
// 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);
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) {