* If a DOM is supplied, the following XML content is supported:
*
* <ul>
+ * <li>fullCRLChain boolean attribute
* <li><KeyInfoResolver> elements with a type attribute
* </ul>
*
*
* @param e DOM to supply configuration for provider
*/
- AbstractPKIXTrustEngine(const xercesc::DOMElement* e=NULL) : TrustEngine(e) {}
+ AbstractPKIXTrustEngine(const xercesc::DOMElement* e=NULL);
+
+ bool m_fullCRLChain;
/**
* Checks that either the name of the peer with the given credentials or the names
* @return true the name check succeeds, false if not
*/
bool checkEntityNames(X509* certEE, const CredentialResolver& credResolver, const CredentialCriteria& criteria) const;
-
+
public:
virtual ~AbstractPKIXTrustEngine() {}
virtual PKIXValidationInfoIterator* getPKIXValidationInfoIterator(
const CredentialResolver& pkixSource, CredentialCriteria* criteria=NULL
) const=0;
+
+ private:
+ bool validateWithCRLs(
+ X509* certEE,
+ STACK_OF(X509)* certChain,
+ const CredentialResolver& credResolver,
+ CredentialCriteria* criteria=NULL,
+ const std::vector<XSECCryptoX509CRL*>* inlineCRLs=NULL
+ ) const;
};
};
*
* @param ownCerts true iff any certificates subsequently stored should be freed by destructor
*/
- BasicX509Credential(bool ownCerts) : m_key(NULL), m_ownCerts(ownCerts), m_crl(NULL), m_keyInfo(NULL), m_compactKeyInfo(NULL) {
+ BasicX509Credential(bool ownCerts) : m_key(NULL), m_ownCerts(ownCerts), m_keyInfo(NULL), m_compactKeyInfo(NULL) {
}
/**
* @param crl optional CRL
*/
BasicX509Credential(XSECCryptoKey* key, const std::vector<XSECCryptoX509*>& certs, XSECCryptoX509CRL* crl=NULL)
- : m_key(key), m_xseccerts(certs), m_ownCerts(true), m_crl(crl), m_keyInfo(NULL), m_compactKeyInfo(NULL) {
+ : m_key(key), m_xseccerts(certs), m_ownCerts(true), m_keyInfo(NULL), m_compactKeyInfo(NULL) {
+ if (crl)
+ m_crls.push_back(crl);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param key key pair or secret key
+ * @param certs array of X.509 certificates, the first entry being the entity certificate
+ * @param crls array of X.509 CRLs
+ */
+ BasicX509Credential(XSECCryptoKey* key, const std::vector<XSECCryptoX509*>& certs, const std::vector<XSECCryptoX509CRL*>& crls)
+ : m_key(key), m_xseccerts(certs), m_ownCerts(true), m_crls(crls), m_keyInfo(NULL), m_compactKeyInfo(NULL) {
}
/** The private/secret key/keypair. */
/** Indicates whether to destroy certificates. */
bool m_ownCerts;
- /** The X.509 CRL. */
- XSECCryptoX509CRL* m_crl;
+ /** The X.509 CRLs. */
+ std::vector<XSECCryptoX509CRL*> m_crls;
/** The KeyInfo object representing the information. */
xmlsignature::KeyInfo* m_keyInfo;
}
XSECCryptoX509CRL* getCRL() const {
- return m_crl;
+ return m_crls.empty() ? NULL : m_crls.front();
+ }
+
+ const std::vector<XSECCryptoX509CRL*>& getCRLs() const {
+ return m_crls;
}
const char* getSubjectName() const {
virtual const std::vector<XSECCryptoX509*>& getEntityCertificateChain() const=0;
/**
+ * @deprecated
+ *
* Gets a CRL associated with the credential.
*
* @return CRL associated with the credential
virtual XSECCryptoX509CRL* getCRL() const=0;
/**
+ * Gets an immutable collection of all CRLs associated with the credential.
+ *
+ * @return CRLs associated with the credential
+ */
+ virtual const std::vector<XSECCryptoX509CRL*>& getCRLs() const=0;
+
+
+ /**
* Gets the subject name of the first certificate in the chain.
*
* @return the Subject DN
#include <xmltooling/security/X509Credential.h>
#include <xmltooling/signature/SignatureValidator.h>
#include <xmltooling/util/NDC.h>
+#include <xercesc/util/XMLUniDefs.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>
using namespace xmlsignature;
}
static bool XMLTOOL_DLLLOCAL validate(
- X509* EE, STACK_OF(X509)* untrusted, AbstractPKIXTrustEngine::PKIXValidationInfoIterator* pkixInfo
+ X509* EE,
+ STACK_OF(X509)* untrusted,
+ AbstractPKIXTrustEngine::PKIXValidationInfoIterator* pkixInfo,
+ bool fullCRLChain,
+ const vector<XSECCryptoX509CRL*>* inlineCRLs=NULL
)
{
Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine");
// First we build a stack of CA certs. These objects are all referenced in place.
- log.debug("building CA list from PKIX Validation information");
+ log.debug("supplying PKIX Validation information");
// We need this for CRL support.
X509_STORE* store=X509_STORE_new();
log_openssl();
return false;
}
- #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
- X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
- #endif
STACK_OF(X509)* CAstack = sk_X509_new_null();
// This contains the state of the validate operation.
+ int count=0;
X509_STORE_CTX ctx;
const vector<XSECCryptoX509*>& CAcerts = pkixInfo->getTrustAnchors();
for (vector<XSECCryptoX509*>::const_iterator i=CAcerts.begin(); i!=CAcerts.end(); ++i) {
if ((*i)->getProviderName()==DSIGConstants::s_unicodeStrPROVOpenSSL) {
sk_X509_push(CAstack,static_cast<OpenSSLCryptoX509*>(*i)->getOpenSSLX509());
+ ++count;
}
}
+ log.debug("supplied (%d) CA certificate(s)", count);
+
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+ count=0;
+ if (inlineCRLs) {
+ for (vector<XSECCryptoX509CRL*>::const_iterator j=inlineCRLs->begin(); j!=inlineCRLs->end(); ++j) {
+ if ((*j)->getProviderName()==DSIGConstants::s_unicodeStrPROVOpenSSL) {
+ // owned by store
+ X509_STORE_add_crl(store, X509_CRL_dup(static_cast<OpenSSLCryptoX509CRL*>(*j)->getOpenSSLX509CRL()));
+ ++count;
+ }
+ }
+ }
const vector<XSECCryptoX509CRL*>& crls = pkixInfo->getCRLs();
for (vector<XSECCryptoX509CRL*>::const_iterator j=crls.begin(); j!=crls.end(); ++j) {
if ((*j)->getProviderName()==DSIGConstants::s_unicodeStrPROVOpenSSL) {
// owned by store
X509_STORE_add_crl(store, X509_CRL_dup(static_cast<OpenSSLCryptoX509CRL*>(*j)->getOpenSSLX509CRL()));
+ ++count;
}
}
-
+ log.debug("supplied (%d) CRL(s)", count);
+ if (count > 0)
+ X509_STORE_set_flags(store, fullCRLChain ? (X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL) : (X509_V_FLAG_CRL_CHECK));
+#else
+ if ((inlineCRLs && !inlineCRLs->empty()) || !pkixInfo->getCRLs().empty()) {
+ log.warn("OpenSSL versions < 0.9.7 do not support CRL checking");
+ }
+#endif
+
// AFAICT, EE and untrusted are passed in but not owned by the ctx.
- #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
if (X509_STORE_CTX_init(&ctx,store,EE,untrusted)!=1) {
log_openssl();
log.error("unable to initialize X509_STORE_CTX");
X509_STORE_free(store);
return false;
}
- #else
+#else
X509_STORE_CTX_init(&ctx,store,EE,untrusted);
- #endif
+#endif
// Seems to be most efficient to just pass in the CA stack.
X509_STORE_CTX_trusted_stack(&ctx,CAstack);
}
};
+AbstractPKIXTrustEngine::AbstractPKIXTrustEngine(const DOMElement* e) : TrustEngine(e), m_fullCRLChain(false)
+{
+ static XMLCh fullCRLChain[] = UNICODE_LITERAL_12(f,u,l,l,C,R,L,C,h,a,i,n);
+ const XMLCh* flag = e ? e->getAttributeNS(NULL, fullCRLChain) : NULL;
+ m_fullCRLChain = (flag && (*flag == chLatin_t || *flag == chDigit_1));
+}
+
bool AbstractPKIXTrustEngine::checkEntityNames(
X509* certEE, const CredentialResolver& credResolver, const CredentialCriteria& criteria
) const
return false;
}
-bool AbstractPKIXTrustEngine::validate(
+bool AbstractPKIXTrustEngine::validateWithCRLs(
X509* certEE,
STACK_OF(X509)* certChain,
const CredentialResolver& credResolver,
- CredentialCriteria* criteria
+ CredentialCriteria* criteria,
+ const std::vector<XSECCryptoX509CRL*>* inlineCRLs
) const
{
#ifdef _DEBUG
- NDC ndc("validate");
+ NDC ndc("validateWithCRLs");
#endif
Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX");
auto_ptr<PKIXValidationInfoIterator> pkix(getPKIXValidationInfoIterator(credResolver, criteria));
while (pkix->next()) {
- if (::validate(certEE,certChain,pkix.get())) {
+ if (::validate(certEE,certChain,pkix.get(),m_fullCRLChain,inlineCRLs)) {
return true;
}
}
}
bool AbstractPKIXTrustEngine::validate(
+ X509* certEE,
+ STACK_OF(X509)* certChain,
+ const CredentialResolver& credResolver,
+ CredentialCriteria* criteria
+ ) const
+{
+ return validateWithCRLs(certEE,certChain,credResolver,criteria);
+}
+
+bool AbstractPKIXTrustEngine::validate(
XSECCryptoX509* certEE,
const vector<XSECCryptoX509*>& certChain,
const CredentialResolver& credResolver,
// Pull the certificate chain out of the signature.
X509Credential* x509cred;
- auto_ptr<Credential> cred(inlineResolver->resolve(&sig,X509Credential::RESOLVE_CERTS));
+ auto_ptr<Credential> cred(inlineResolver->resolve(&sig,X509Credential::RESOLVE_CERTS|X509Credential::RESOLVE_CRLS));
if (!cred.get() || !(x509cred=dynamic_cast<X509Credential*>(cred.get()))) {
log.error("unable to perform PKIX validation, signature does not contain any certificates");
return false;
}
}
- if (certEE)
- return validate(certEE,certs,credResolver,criteria);
-
- log.debug("failed to verify signature with embedded certificates");
- return false;
+ if (!certEE) {
+ log.debug("failed to verify signature with embedded certificates");
+ return false;
+ }
+ else if (certEE->getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
+ log.error("only the OpenSSL XSEC provider is supported");
+ return false;
+ }
+
+ STACK_OF(X509)* untrusted=sk_X509_new_null();
+ for (vector<XSECCryptoX509*>::const_iterator i=certs.begin(); i!=certs.end(); ++i)
+ sk_X509_push(untrusted,static_cast<OpenSSLCryptoX509*>(*i)->getOpenSSLX509());
+ const vector<XSECCryptoX509CRL*>& crls = x509cred->getCRLs();
+ bool ret = validateWithCRLs(static_cast<OpenSSLCryptoX509*>(certEE)->getOpenSSLX509(), untrusted, credResolver, criteria, &crls);
+ sk_X509_free(untrusted);
+ return ret;
}
bool AbstractPKIXTrustEngine::validate(
delete m_key;
if (m_ownCerts)
for_each(m_xseccerts.begin(), m_xseccerts.end(), xmltooling::cleanup<XSECCryptoX509>());
- delete m_crl;
+ for_each(m_crls.begin(), m_crls.end(), xmltooling::cleanup<XSECCryptoX509CRL>());
delete m_keyInfo;
delete m_compactKeyInfo;
}
in = NULL;
}
- // Load the key.
+ // Load the CRL.
crl = loadCRL();
}
private:
bool resolveCerts(const KeyInfo* keyInfo);
bool resolveKey(const KeyInfo* keyInfo);
- bool resolveCRL(const KeyInfo* keyInfo);
+ bool resolveCRLs(const KeyInfo* keyInfo);
KeyInfoCredentialContext* m_credctx;
};
}
if (types & X509Credential::RESOLVE_CRLS)
- resolveCRL(keyInfo);
+ resolveCRLs(keyInfo);
const XMLCh* n;
char* kn;
return !m_xseccerts.empty();
}
-bool InlineCredential::resolveCRL(const KeyInfo* keyInfo)
+bool InlineCredential::resolveCRLs(const KeyInfo* keyInfo)
{
Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
log.debug("resolving ds:X509CRL");
auto_ptr<XSECCryptoX509CRL> crl(XMLToolingConfig::getConfig().X509CRL());
crl->loadX509CRLBase64Bin(x.get(), strlen(x.get()));
- m_crl = crl.release();
- return true;
+ m_crls.push_back(crl.release());
}
}
catch(XSECException& e) {
}
}
- return false;
+ log.debug("resolved %d CRL(s)", m_crls.size());
+ return !m_crls.empty();
}
void InlineCredential::resolve(DSIGKeyInfoList* keyInfo, int types)
try {
auto_ptr<XSECCryptoX509CRL> crlobj(XMLToolingConfig::getConfig().X509CRL());
crlobj->loadX509CRLBase64Bin(buf.get(), strlen(buf.get()));
- m_crl = crlobj.release();
- break;
+ m_crls.push_back(crlobj.release());
}
catch(XSECException& e) {
auto_ptr_char temp(e.getMsg());
namespace xmltooling {
- static const XMLCh _CredentialResolver[] = UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,l,R,e,s,o,l,v,e,r);\r
- static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e);\r
- static const XMLCh certificate[] = UNICODE_LITERAL_11(c,e,r,t,i,f,i,c,a,t,e);\r
- static const XMLCh Certificate[] = UNICODE_LITERAL_11(C,e,r,t,i,f,i,c,a,t,e);\r
- static const XMLCh Path[] = UNICODE_LITERAL_4(P,a,t,h);\r
+ static const XMLCh _CredentialResolver[] = UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,l,R,e,s,o,l,v,e,r);
+ static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e);
+ static const XMLCh certificate[] = UNICODE_LITERAL_11(c,e,r,t,i,f,i,c,a,t,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);
static const XMLCh verifyDepth[] = UNICODE_LITERAL_11(v,e,r,i,f,y,D,e,p,t,h);
-\r
+
class XMLTOOL_DLLLOCAL StaticPKIXTrustEngine : public AbstractPKIXTrustEngine
{
public:
else
m_depth = 1;
- if (e && e->hasAttributeNS(NULL,certificate)) {\r
- // Simple File resolver config rooted here.\r
- m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER,e);\r
- }\r
- else {\r
- e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;\r
- auto_ptr_char t(e ? e->getAttributeNS(NULL,type) : NULL);\r
- if (t.get()) {\r
- m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.get(),e);\r
- }\r
- else\r
- throw XMLSecurityException("Missing <CredentialResolver> element, or no type attribute found");\r
- }\r
-\r
- m_credResolver->lock();\r
+ if (e && e->hasAttributeNS(NULL,certificate)) {
+ // Simple File resolver config rooted here.
+ m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER,e);
+ }
+ else {
+ e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;
+ auto_ptr_char t(e ? e->getAttributeNS(NULL,type) : NULL);
+ if (t.get()) {
+ m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.get(),e);
+ }
+ else
+ throw XMLSecurityException("Missing <CredentialResolver> element, or no type attribute found");
+ }
+
+ m_credResolver->lock();
// Merge together all X509Credentials we can resolve.
try {
const X509Credential* xcred = dynamic_cast<const X509Credential*>(*i);
if (xcred) {
m_certs.insert(m_certs.end(), xcred->getEntityCertificateChain().begin(), xcred->getEntityCertificateChain().end());
- if (xcred->getCRL())
- m_crls.push_back(xcred->getCRL());
+ m_crls.insert(m_crls.end(), xcred->getCRLs().begin(), xcred->getCRLs().end());
}
}
}
projects / shibboleth / xmltooling.git / commitdiff