/*
- * 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 "exceptions.h"
-#include "binding/XMLSigningRule.h"
+#include "binding/SecurityPolicyRule.h"
#include "saml2/core/Assertions.h"
#include "saml2/metadata/Metadata.h"
+#include "saml2/metadata/MetadataCredentialCriteria.h"
#include "saml2/metadata/MetadataProvider.h"
#include "signature/SignatureProfileValidator.h"
using namespace log4cpp;
using namespace std;
+using xmlsignature::SignatureException;
+
namespace opensaml {
+ class SAML_DLLLOCAL XMLSigningRule : public SecurityPolicyRule
+ {
+ public:
+ XMLSigningRule(const DOMElement* e);
+ virtual ~XMLSigningRule() {}
+
+ void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+
+ private:
+ bool m_errorsFatal;
+ };
+
SecurityPolicyRule* SAML_DLLLOCAL XMLSigningRuleFactory(const DOMElement* const & e)
{
return new XMLSigningRule(e);
}
+
+ static const XMLCh errorsFatal[] = UNICODE_LITERAL_11(e,r,r,o,r,s,F,a,t,a,l);
};
+XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorsFatal(false)
+{
+ if (e) {
+ const XMLCh* flag = e->getAttributeNS(NULL, errorsFatal);
+ m_errorsFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ }
+}
+
void XMLSigningRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
{
Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.XMLSigning");
- log.debug("evaluating message signing policy");
if (!policy.getIssuerMetadata()) {
log.debug("ignoring message, no issuer metadata supplied");
}
const SignableObject* signable = dynamic_cast<const SignableObject*>(&message);
- if (!signable || !signable->getSignature()) {
- log.debug("ignoring unsigned or unrecognized message");
+ if (!signable || !signable->getSignature())
return;
- }
log.debug("validating signature profile");
try {
SignatureProfileValidator sigval;
- sigval.validate(signable->getSignature());
+ sigval.validateSignature(*(signable->getSignature()));
}
catch (ValidationException& ve) {
log.error("signature profile failed to validate: %s", ve.what());
+ if (m_errorsFatal)
+ throw;
return;
}
- if (!policy.getTrustEngine()->validate(
- *(signable->getSignature()), *(policy.getIssuerMetadata()), 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());
+
+ if (!policy.getTrustEngine()->validate(*(signable->getSignature()), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
+ if (m_errorsFatal)
+ throw SignatureException("Message was signed, but signature could not be verified.");
return;
}
log.debug("signature verified against message issuer");
+ policy.setSecure(true);
}