projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relax restriction on HTTP method.
[shibboleth/cpp-opensaml.git]
/
saml
/
saml2
/
binding
/
impl
/
SAML2RedirectDecoder.cpp
diff --git
a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index
a5e599d
..
6d6ce6d
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@
-1,6
+1,6
@@
/*
* Copyright 2001-2007 Internet2
/*
* Copyright 2001-2007 Internet2
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@
-16,13
+16,13
@@
/**
* SAML2RedirectDecoder.cpp
/**
* SAML2RedirectDecoder.cpp
- *
+ *
* SAML 2.0 HTTP Redirect binding message encoder
*/
#include "internal.h"
#include "exceptions.h"
* SAML 2.0 HTTP Redirect binding message encoder
*/
#include "internal.h"
#include "exceptions.h"
-#include "
binding/
MessageDecoder.h"
+#include "
saml2/binding/SAML2
MessageDecoder.h"
#include "saml2/binding/SAML2Redirect.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/binding/SAML2Redirect.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
@@
-44,19
+44,19
@@
using namespace xmltooling;
using namespace std;
namespace opensaml {
using namespace std;
namespace opensaml {
- namespace saml2p {
- class SAML_DLLLOCAL SAML2RedirectDecoder : public MessageDecoder
+ namespace saml2p {
+ class SAML_DLLLOCAL SAML2RedirectDecoder : public
SAML2
MessageDecoder
{
public:
SAML2RedirectDecoder() {}
virtual ~SAML2RedirectDecoder() {}
{
public:
SAML2RedirectDecoder() {}
virtual ~SAML2RedirectDecoder() {}
-
+
xmltooling::XMLObject* decode(
std::string& relayState,
const GenericRequest& genericRequest,
SecurityPolicy& policy
) const;
xmltooling::XMLObject* decode(
std::string& relayState,
const GenericRequest& genericRequest,
SecurityPolicy& policy
) const;
- };
+ };
MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
@@
-80,13
+80,11
@@
XMLObject* SAML2RedirectDecoder::decode(
const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
if (!httpRequest)
throw BindingException("Unable to cast request object to HTTPRequest type.");
const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
if (!httpRequest)
throw BindingException("Unable to cast request object to HTTPRequest type.");
- if (strcmp(httpRequest->getMethod(),"GET"))
- throw BindingException("Invalid HTTP method ($1).", params(1, httpRequest->getMethod()));
const char* msg = httpRequest->getParameter("SAMLResponse");
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
const char* msg = httpRequest->getParameter("SAMLResponse");
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
- throw BindingException("Request missing SAMLRequest or SAMLResponse parameter.");
+ throw BindingException("Request missing SAMLRequest or SAMLResponse
query string
parameter.");
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
@@
-99,21
+97,29
@@
XMLObject* SAML2RedirectDecoder::decode(
}
// Decode the compressed message into SAML. First we base64-decode it.
}
// Decode the compressed message into SAML. First we base64-decode it.
-
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 Redirect binding message.");
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in Redirect binding message.");
-
+
// Now we have to inflate it.
stringstream s;
// Now we have to inflate it.
stringstream s;
- if (inflate((char*)decoded, x, s)==0) {
+ if (inflate(reinterpret_cast<char*>(decoded), x, s)==0) {
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
XMLString::release(&decoded);
XMLString::release(&decoded);
+#else
+ XMLString::release((char**)&decoded);
+#endif
throw BindingException("Unable to inflate Redirect binding message.");
}
if (log.isDebugEnabled())
log.debug("decoded SAML message:\n%s", s.str().c_str());
throw BindingException("Unable to inflate Redirect binding message.");
}
if (log.isDebugEnabled())
log.debug("decoded SAML message:\n%s", s.str().c_str());
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
XMLString::release(&decoded);
XMLString::release(&decoded);
-
+#else
+ XMLString::release((char**)&decoded);
+#endif
+
// Parse and bind the document into an XMLObject.
DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
: XMLToolingConfig::getConfig().getParser()).parse(s);
// Parse and bind the document into an XMLObject.
DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
: XMLToolingConfig::getConfig().getParser()).parse(s);
@@
-133,12
+139,13
@@
XMLObject* SAML2RedirectDecoder::decode(
else {
root = static_cast<saml2::RootObject*>(request);
}
else {
root = static_cast<saml2::RootObject*>(request);
}
-
+
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());