#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;
SimpleSigningRule(const DOMElement* e);
virtual ~SimpleSigningRule() {}
- void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+ const char* getType() const {
+ return SIMPLESIGNING_POLICY_RULE;
+ }
+ void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
private:
// Appends a raw parameter=value pair to the string.
static bool appendParameter(string& s, const char* data, const char* name);
- bool m_errorsFatal;
+ bool m_errorFatal;
};
SecurityPolicyRule* SAML_DLLLOCAL SimpleSigningRuleFactory(const DOMElement* const & e)
return new SimpleSigningRule(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);
};
bool SimpleSigningRule::appendParameter(string& s, const char* data, const char* name)
return true;
}
-SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorsFatal(false)
+SimpleSigningRule::SimpleSigningRule(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));
}
}
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;
}
KeyInfo* keyInfo=NULL;
pch = request->getParameter("KeyInfo");
if (pch) {
- try {
- istringstream kstrm(pch);
- DOMDocument* doc = XMLToolingConfig::getConfig().getParser().parse(kstrm);
- XercesJanitor<DOMDocument> janitor(doc);
- XMLObject* kxml = XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true);
- janitor.release();
- if (!(keyInfo=dynamic_cast<KeyInfo*>(kxml)))
- delete kxml;
+ unsigned int x;
+ XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(pch),&x);
+ if (decoded) {
+ try {
+ istringstream kstrm(pch);
+ DOMDocument* doc = XMLToolingConfig::getConfig().getParser().parse(kstrm);
+ XercesJanitor<DOMDocument> janitor(doc);
+ XMLObject* kxml = XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true);
+ janitor.release();
+ if (!(keyInfo=dynamic_cast<KeyInfo*>(kxml)))
+ delete kxml;
+ }
+ catch (XMLToolingException& ex) {
+ log.warn("Failed to load KeyInfo from message: %s", ex.what());
+ }
}
- catch (XMLToolingException& ex) {
- log.warn("Failed to load KeyInfo from message: %s", ex.what());
+ else {
+ log.warn("Failed to load KeyInfo from message: Unable to decode base64-encoded KeyInfo.");
}
}
MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
cc.setXMLAlgorithm(alg.get());
- if (!policy.getTrustEngine()->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(policy.getMetadataProvider()), &cc)) {
+ 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.");
+ 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);
}