projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply manual validators even when schema was used.
[shibboleth/cpp-opensaml.git]
/
saml
/
saml2
/
binding
/
impl
/
SAML2POSTDecoder.cpp
diff --git
a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index
d3047ed
..
99a5f3c
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
7
Internet2
+ * Copyright 2001-200
9
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,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;
@@
-92,17
+94,17
@@
XMLObject* SAML2POSTDecoder::decode(
relayState.erase();
// Decode the base64 into SAML.
relayState.erase();
// Decode the base64 into SAML.
-
unsigned in
t x;
+
xsecsize_
t x;
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:\n" << 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();
@@
-120,11
+122,11
@@
XMLObject* SAML2POSTDecoder::decode(
root = static_cast<saml2::RootObject*>(request);
}
root = static_cast<saml2::RootObject*>(request);
}
- 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());
@@
-134,7
+136,7
@@
XMLObject* SAML2POSTDecoder::decode(
log.error("signed SAML message missing Destination attribute");
throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
}
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.");
}
log.error("POST targeted at (%s), but delivered to (%s)", dest.get(), dest2);
throw BindingException("SAML message delivered with POST to incorrect server URL.");
}