projects
/
shibboleth
/
opensaml2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to memory input source to allow for 16-bit data.
[shibboleth/opensaml2.git]
/
saml
/
saml2
/
binding
/
impl
/
SAML2POSTDecoder.cpp
diff --git
a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index
8595e7e
..
fb0342b
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@
-22,13
+22,15
@@
#include "internal.h"
#include "exceptions.h"
#include "internal.h"
#include "exceptions.h"
-#include "
binding/
MessageDecoder.h"
+#include "
saml2/binding/SAML2
MessageDecoder.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
-#include <xmltooling/logging.h>
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
#include <xercesc/util/Base64.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>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/validation/ValidatorSuite.h>
@@
-43,7
+45,7
@@
using namespace std;
namespace opensaml {
namespace saml2p {
namespace opensaml {
namespace saml2p {
- class SAML_DLLLOCAL SAML2POSTDecoder : public MessageDecoder
+ class SAML_DLLLOCAL SAML2POSTDecoder : public
SAML2
MessageDecoder
{
public:
SAML2POSTDecoder() {}
{
public:
SAML2POSTDecoder() {}
@@
-84,7
+86,7
@@
XMLObject* SAML2POSTDecoder::decode(
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
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;
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
@@
-96,13
+98,13
@@
XMLObject* SAML2POSTDecoder::decode(
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST binding message.");
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.
// 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()
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();
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
@@
-121,10
+123,11
@@
XMLObject* SAML2POSTDecoder::decode(
}
if (!policy.getValidating())
}
if (!policy.getValidating())
- SchemaValidators.validate(
xmlObject.get()
);
+ SchemaValidators.validate(
root
);
// Run through the policy.
// Run through the policy.
- policy.evaluate(*root, &genericRequest, samlconstants::SAML20P_NS);
+ extractMessageDetails(*root, genericRequest, samlconstants::SAML20P_NS, policy);
+ policy.evaluate(*root, &genericRequest);
// Check destination URL.
auto_ptr_char dest(request ? request->getDestination() : response->getDestination());
// Check destination URL.
auto_ptr_char dest(request ? request->getDestination() : response->getDestination());