/*
- * Copyright 2001-2007 Internet2
+ * Copyright 2001-2010 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* ClientCertAuthRule.cpp
*
- * TLS client authentication SecurityPolicyRule
+ * TLS client authentication SecurityPolicyRule.
*/
#include "internal.h"
#include "exceptions.h"
+#include "binding/SecurityPolicy.h"
#include "binding/SecurityPolicyRule.h"
#include "saml2/metadata/Metadata.h"
+#include "saml2/metadata/MetadataCredentialCriteria.h"
#include "saml2/metadata/MetadataProvider.h"
+#include <xmltooling/logging.h>
+#include <xmltooling/io/GenericRequest.h>
+#include <xmltooling/security/Credential.h>
#include <xmltooling/security/X509TrustEngine.h>
#include <xmltooling/util/ReplayCache.h>
-#include <log4cpp/Category.hh>
using namespace opensaml::saml2md;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
class SAML_DLLLOCAL ClientCertAuthRule : public SecurityPolicyRule
{
public:
- ClientCertAuthRule(const DOMElement* e) {}
+ ClientCertAuthRule(const DOMElement* e);
virtual ~ClientCertAuthRule() {}
- void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+ const char* getType() const {
+ return CLIENTCERTAUTH_POLICY_RULE;
+ }
+ bool evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+
+ private:
+ bool m_errorFatal;
};
SecurityPolicyRule* SAML_DLLLOCAL ClientCertAuthRuleFactory(const DOMElement* const & e)
{
return new ClientCertAuthRule(e);
}
+
+ static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
};
-void ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
+ClientCertAuthRule::ClientCertAuthRule(const DOMElement* e) : m_errorFatal(false)
+{
+ if (e) {
+ const XMLCh* flag = e->getAttributeNS(nullptr, errorFatal);
+ m_errorFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ }
+}
+
+bool ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
{
Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.ClientCertAuth");
if (!request)
- return;
+ return false;
if (!policy.getIssuerMetadata()) {
log.debug("ignoring message, no issuer metadata supplied");
- return;
+ return false;
}
const X509TrustEngine* x509trust;
if (!(x509trust=dynamic_cast<const X509TrustEngine*>(policy.getTrustEngine()))) {
log.debug("ignoring message, no X509TrustEngine supplied");
- return;
+ return false;
}
- const std::vector<XSECCryptoX509*>& chain = request->getClientCertificates();
+ const vector<XSECCryptoX509*>& chain = request->getClientCertificates();
if (chain.empty())
- return;
+ return false;
- if (!x509trust->validate(chain.front(), chain, *(policy.getIssuerMetadata()), true,
- policy.getMetadataProvider()->getKeyResolver())) {
+ // Set up criteria object, including peer name to enforce cert name checking.
+ MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
+ auto_ptr_char pn(policy.getIssuer()->getName());
+ cc.setPeerName(pn.get());
+ cc.setUsage(Credential::TLS_CREDENTIAL);
+
+ if (!x509trust->validate(chain.front(), chain, *(policy.getMetadataProvider()), &cc)) {
+ if (m_errorFatal)
+ throw SecurityPolicyException("Client certificate supplied, but could not be verified.");
log.error("unable to verify certificate chain with supplied trust engine");
- return;
+ return false;
}
log.debug("client certificate verified against message issuer");
- policy.setSecure(true);
+ policy.setAuthenticated(true);
+ return true;
}