/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "internal.h"
#include <saml/SAMLConfig.h>
#include <saml/saml2/metadata/Metadata.h>
+#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <saml/saml2/metadata/MetadataProvider.h>
#include <xmltooling/security/AbstractPKIXTrustEngine.h>
+#include <xmltooling/security/X509Credential.h>
using namespace opensaml::saml2;
using namespace opensaml::saml2md;
~SampleTrustEngine() {}
class SampleIterator : public PKIXValidationInfoIterator {
- vector<XSECCryptoX509CRL*> m_crls;
- KeyResolver::ResolvedCertificates m_certs;
- KeyResolver* m_resolver;
+ CredentialResolver* m_resolver;
+ mutable vector<XSECCryptoX509CRL*> m_crls;
bool m_done;
public:
SampleIterator() : m_resolver(NULL), m_done(false) {
- string config = data_path + "security/FilesystemKeyResolver.xml";
+ string config = data_path + "security/FilesystemCredentialResolver.xml";
ifstream in(config.c_str());
DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
XercesJanitor<DOMDocument> janitor(doc);
- m_resolver = XMLToolingConfig::getConfig().KeyResolverManager.newPlugin(
- FILESYSTEM_KEY_RESOLVER,doc->getDocumentElement()
+ m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
+ FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
);
- m_resolver->resolveCertificates((KeyInfo*)NULL,m_certs);
+ m_resolver->lock();
}
~SampleIterator() {
+ m_resolver->unlock();
delete m_resolver;
}
}
const vector<XSECCryptoX509*>& getTrustAnchors() const {
- return m_certs.v();
+ return dynamic_cast<const X509Credential*>(m_resolver->resolve())->getEntityCertificateChain();
}
const vector<XSECCryptoX509CRL*>& getCRLs() const {
+ XSECCryptoX509CRL* crl = dynamic_cast<const X509Credential*>(m_resolver->resolve())->getCRL();
+ if (crl)
+ m_crls.push_back(crl);
return m_crls;
}
};
- PKIXValidationInfoIterator* getPKIXValidationInfoIterator(const KeyInfoSource& keyInfoSource) const {
- dynamic_cast<const RoleDescriptor&>(keyInfoSource);
+ PKIXValidationInfoIterator* getPKIXValidationInfoIterator(
+ const CredentialResolver& credResolver, CredentialCriteria* criteria=NULL, const KeyInfoResolver* keyInfoResolver=NULL
+ ) const {
+ dynamic_cast<const MetadataCredentialCriteria*>(criteria);
return new SampleIterator();
}
};
SAMLObjectBaseTestCase::tearDown();
}
- void testExplicitKeyTrustEngine() {
- string config = data_path + "security/FilesystemMetadataProvider.xml";
+ void testAbstractPKIXTrustEngine() {
+ string config = data_path + "security/XMLMetadataProvider.xml";
ifstream in(config.c_str());
DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
XercesJanitor<DOMDocument> janitor(doc);
// Build metadata provider.
auto_ptr<MetadataProvider> metadataProvider(
- SAMLConfig::getConfig().MetadataProviderManager.newPlugin(FILESYSTEM_METADATA_PROVIDER,doc->getDocumentElement())
+ opensaml::SAMLConfig::getConfig().MetadataProviderManager.newPlugin(XML_METADATA_PROVIDER,doc->getDocumentElement())
);
try {
metadataProvider->init();
Signature* sig=assertion->getSignature();
TSM_ASSERT("Signature not present", sig!=NULL);
- TSM_ASSERT("Signature failed to validate.", trustEngine->validate(*sig, *role, metadataProvider->getKeyResolver()));
+
+ MetadataCredentialCriteria cc(*role);
+ cc.setPeerName("https://idp.example.org");
+ TSM_ASSERT("Signature failed to validate.", trustEngine->validate(*sig, *metadataProvider, &cc));
descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
role=descriptor->getIDPSSODescriptors().front();
TSM_ASSERT("Role not present", role!=NULL);
- TSM_ASSERT("Signature validated.", !trustEngine->validate(*sig, *role, metadataProvider->getKeyResolver()));
+ MetadataCredentialCriteria cc2(*role);
+ cc2.setPeerName("https://idp2.example.org");
+ TSM_ASSERT("Signature validated.", !trustEngine->validate(*sig, *metadataProvider, &cc2));
}
};