#include "exceptions.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/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 {
void ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
{
Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.ClientCertAuth");
- log.debug("evaluating client certificate authentication policy");
- if (!request) {
- log.debug("ignoring message, no protocol request available");
+ if (!request)
return;
- }
- else if (!policy.getIssuerMetadata()) {
+
+ if (!policy.getIssuerMetadata()) {
log.debug("ignoring message, no issuer metadata supplied");
return;
}
}
const std::vector<XSECCryptoX509*>& chain = request->getClientCertificates();
- if (chain.empty()) {
- log.debug("ignoring message, no client certificates in request");
+ if (chain.empty())
return;
- }
- 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(CredentialCriteria::TLS_CREDENTIAL);
+
+ if (!x509trust->validate(chain.front(), chain, *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify certificate chain with supplied trust engine");
return;
}