#include "internal.h"
#include "exceptions.h"
-#include "binding/HTTPRequest.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 <log4cpp/Category.hh>
#include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
+#include <xmltooling/io/HTTPRequest.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::KeyInfo;
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;
}
auto_ptr<KeyInfo> kjanitor(keyInfo);
auto_ptr_XMLCh alg(sigAlgorithm);
-
- if (!policy.getTrustEngine()->validate(
- alg.get(), signature, keyInfo, input.c_str(), input.length(),
- *(policy.getIssuerMetadata()), policy.getMetadataProvider()->getKeyResolver()
- )) {
+
+ // Set up criteria object.
+ MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
+ cc.setXMLAlgorithm(alg.get());
+
+ if (!sigtrust->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(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.");