#include "internal.h"
#include "exceptions.h"
-#include "binding/MessageDecoder.h"
+#include "saml2/binding/SAML2MessageDecoder.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
-#include <log4cpp/Category.hh>
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
#include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml2p;
using namespace opensaml::saml2;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml2p {
- class SAML_DLLLOCAL SAML2POSTDecoder : public MessageDecoder
+ class SAML_DLLLOCAL SAML2POSTDecoder : public SAML2MessageDecoder
{
public:
SAML2POSTDecoder() {}
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
- throw BindingException("Request missing SAMLRequest or SAMLResponse parameter.");
+ throw BindingException("Request missing SAMLRequest or SAMLResponse form parameter.");
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST binding message.");
- log.debug("decoded SAML message:\n%s", decoded);
- istringstream is(reinterpret_cast<char*>(decoded));
- XMLString::release(&decoded);
+ log.debugStream() << "decoded SAML message:" << logging::eol << decoded << logging::eol;
// Parse and bind the document into an XMLObject.
+ MemBufInputSource src(decoded, x, "SAMLMessage", true);
+ Wrapper4InputSource dsrc(&src, false);
DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
- : XMLToolingConfig::getConfig().getParser()).parse(is);
+ : XMLToolingConfig::getConfig().getParser()).parse(dsrc);
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
}
if (!policy.getValidating())
- SchemaValidators.validate(xmlObject.get());
+ SchemaValidators.validate(root);
// Run through the policy.
+ extractMessageDetails(*root, genericRequest, samlconstants::SAML20P_NS, policy);
policy.evaluate(*root, &genericRequest);
// Check destination URL.
log.error("signed SAML message missing Destination attribute");
throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
}
- else if ((delim && strncmp(dest.get(), dest2, delim - dest2)) || (!delim && strcmp(dest.get(),dest2))) {
+ else if (dest.get() && *dest.get() && ((delim && strncmp(dest.get(), dest2, delim - dest2)) || (!delim && strcmp(dest.get(),dest2)))) {
log.error("POST targeted at (%s), but delivered to (%s)", dest.get(), dest2);
throw BindingException("SAML message delivered with POST to incorrect server URL.");
}