#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"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
+#include <xmltooling/security/SignatureTrustEngine.h>
using namespace opensaml::saml2md;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
using xmlsignature::SignatureException;
XMLSigningRule(const DOMElement* e);
virtual ~XMLSigningRule() {}
- void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+ const char* getType() const {
+ return XMLSIGNING_POLICY_RULE;
+ }
+ void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
private:
- bool m_errorsFatal;
+ bool m_errorFatal;
};
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);
+ static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
};
-XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorsFatal(false)
+XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorFatal(false)
{
if (e) {
- const XMLCh* flag = e->getAttributeNS(NULL, errorsFatal);
- m_errorsFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ const XMLCh* flag = e->getAttributeNS(NULL, errorFatal);
+ m_errorFatal = (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");
return;
}
- else if (!policy.getTrustEngine()) {
- log.debug("ignoring message, no TrustEngine supplied");
+
+ const SignatureTrustEngine* sigtrust;
+ if (!(sigtrust=dynamic_cast<const SignatureTrustEngine*>(policy.getTrustEngine()))) {
+ log.debug("ignoring message, no SignatureTrustEngine supplied");
return;
}
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)
+ if (m_errorFatal)
throw;
return;
}
- if (!policy.getTrustEngine()->validate(
- *(signable->getSignature()), *(policy.getIssuerMetadata()), policy.getMetadataProvider()->getKeyResolver()
- )) {
+ // Set up criteria object.
+ MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
+
+ if (!sigtrust->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.");
+ if (m_errorFatal)
+ throw SecurityPolicyException("Message was signed, but signature could not be verified.");
return;
}
log.debug("signature verified against message issuer");
- policy.setSecure(true);
+ policy.setAuthenticated(true);
}