#include "internal.h"
#include "exceptions.h"
-#include "binding/HTTPRequest.h"
+#include "binding/MessageDecoder.h"
#include "saml1/core/Assertions.h"
-#include "saml1/binding/SAML1POSTDecoder.h"
+#include "saml1/core/Protocols.h"
#include "saml2/metadata/Metadata.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/util/NDC.h>
#include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml1p;
using namespace opensaml::saml1;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml1p {
- MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const DOMElement* const & e)
+ class SAML_DLLLOCAL SAML1POSTDecoder : public MessageDecoder
{
- return new SAML1POSTDecoder(e);
+ public:
+ SAML1POSTDecoder() {}
+ virtual ~SAML1POSTDecoder() {}
+
+ xmltooling::XMLObject* decode(
+ std::string& relayState,
+ const GenericRequest& genericRequest,
+ SecurityPolicy& policy
+ ) const;
+ };
+
+ MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+ {
+ return new SAML1POSTDecoder();
}
};
};
-SAML1POSTDecoder::SAML1POSTDecoder(const DOMElement* e) {}
-
XMLObject* SAML1POSTDecoder::decode(
string& relayState,
const GenericRequest& genericRequest,
log.debug("validating input");
const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
- if (!httpRequest) {
- log.error("unable to cast request to HTTPRequest type");
- return NULL;
- }
+ if (!httpRequest)
+ throw BindingException("Unable to cast request object to HTTPRequest type.");
if (strcmp(httpRequest->getMethod(),"POST"))
- return NULL;
+ throw BindingException("Invalid HTTP method ($1).", params(1, httpRequest->getMethod()));
const char* samlResponse = httpRequest->getParameter("SAMLResponse");
const char* TARGET = httpRequest->getParameter("TARGET");
if (!samlResponse || !TARGET)
- return NULL;
+ throw BindingException("Request missing SAMLResponse or TARGET parameters.");
relayState = TARGET;
// Decode the base64 into SAML.
// Check recipient URL.
auto_ptr_char recipient(response->getRecipient());
const char* recipient2 = httpRequest->getRequestURL();
+ const char* delim = strchr(recipient2, '?');
if (!recipient.get() || !*(recipient.get())) {
log.error("response missing Recipient attribute");
throw BindingException("SAML response did not contain Recipient attribute identifying intended destination.");
}
- else if (!recipient2 || !*recipient2 || strcmp(recipient.get(),recipient2)) {
- log.error("POST targeted at (%s), but delivered to (%s)", recipient.get(), recipient2 ? recipient2 : "none");
+ else if ((delim && strncmp(recipient.get(), recipient2, delim - recipient2)) || (!delim && strcmp(recipient.get(),recipient2))) {
+ log.error("POST targeted at (%s), but delivered to (%s)", recipient.get(), recipient2);
throw BindingException("SAML message delivered with POST to incorrect server URL.");
}