projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settable digest algorithm, enhanced prefix handling in signatures, pending xmlsec...
[shibboleth/cpp-opensaml.git]
/
saml
/
binding
/
impl
/
XMLSigningRule.cpp
diff --git
a/saml/binding/impl/XMLSigningRule.cpp
b/saml/binding/impl/XMLSigningRule.cpp
index
2bd4c11
..
989cb05
100644
(file)
--- a/
saml/binding/impl/XMLSigningRule.cpp
+++ b/
saml/binding/impl/XMLSigningRule.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
6
Internet2
+ * Copyright 2001-200
7
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,9
+22,10
@@
#include "internal.h"
#include "exceptions.h"
#include "internal.h"
#include "exceptions.h"
-#include "binding/
XMLSigning
Rule.h"
+#include "binding/
SecurityPolicy
Rule.h"
#include "saml2/core/Assertions.h"
#include "saml2/metadata/Metadata.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 "saml2/metadata/MetadataProvider.h"
#include "signature/SignatureProfileValidator.h"
@@
-36,17
+37,40
@@
using namespace xmltooling;
using namespace log4cpp;
using namespace std;
using namespace log4cpp;
using namespace std;
+using xmlsignature::SignatureException;
+
namespace opensaml {
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);
}
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");
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");
if (!policy.getIssuerMetadata()) {
log.debug("ignoring message, no issuer metadata supplied");
@@
-58,25
+82,28
@@
void XMLSigningRule::evaluate(const XMLObject& message, const GenericRequest* re
}
const SignableObject* signable = dynamic_cast<const SignableObject*>(&message);
}
const SignableObject* signable = dynamic_cast<const SignableObject*>(&message);
- if (!signable || !signable->getSignature()) {
- log.debug("ignoring unsigned or unrecognized message");
+ if (!signable || !signable->getSignature())
return;
return;
- }
log.debug("validating signature profile");
try {
SignatureProfileValidator sigval;
log.debug("validating signature profile");
try {
SignatureProfileValidator sigval;
- sigval.validate
(signable->getSignature(
));
+ sigval.validate
Signature(*(signable->getSignature()
));
}
catch (ValidationException& ve) {
log.error("signature profile failed to validate: %s", ve.what());
}
catch (ValidationException& ve) {
log.error("signature profile failed to validate: %s", ve.what());
+ if (m_errorsFatal)
+ throw;
return;
}
return;
}
- if (!policy.getTrustEngine()->validate(
- *(signable->getSignature()), *(policy.getIssuerMetadata()), policy.getMetadataProvider()->getKeyResolver()
- )) {
+ // Set up criteria object.
+ MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
+
+ if (!policy.getTrustEngine()->validate(*(signable->getSignature()), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
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;
}
return;
}