/*
- * Copyright 2001-2007 Internet2
- *
+ * Copyright 2001-2010 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
/**
* SAML2RedirectDecoder.cpp
- *
- * SAML 2.0 HTTP Redirect binding message encoder
+ *
+ * SAML 2.0 HTTP Redirect binding message encoder.
*/
#include "internal.h"
#include "exceptions.h"
-#include "binding/MessageDecoder.h"
+#include "binding/SecurityPolicy.h"
+#include "saml2/binding/SAML2MessageDecoder.h"
#include "saml2/binding/SAML2Redirect.h"
#include "saml2/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/XMLToolingConfig.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
#include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml2md;
using namespace opensaml::saml2;
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
- namespace saml2p {
- class SAML_DLLLOCAL SAML2RedirectDecoder : public MessageDecoder
+ namespace saml2p {
+ class SAML_DLLLOCAL SAML2RedirectDecoder : public SAML2MessageDecoder
{
public:
SAML2RedirectDecoder() {}
virtual ~SAML2RedirectDecoder() {}
-
+
+ const char* getShortName() const {
+ return "Redirect";
+ }
+
xmltooling::XMLObject* decode(
std::string& relayState,
const GenericRequest& genericRequest,
SecurityPolicy& policy
) const;
- };
+ };
MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
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)
- 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;
}
// Decode the compressed message into SAML. First we base64-decode it.
- unsigned int 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.");
-
+
// 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);
+#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());
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
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);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
- saml2::RootObject* root = NULL;
- StatusResponseType* response = NULL;
+ saml2::RootObject* root = nullptr;
+ StatusResponseType* response = nullptr;
RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject.get());
if (!request) {
response = dynamic_cast<StatusResponseType*>(xmlObject.get());
else {
root = static_cast<saml2::RootObject*>(request);
}
-
- 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("Redirect targeted at (%s), but delivered to (%s)", dest.get(), dest2);
throw BindingException("SAML message delivered with Redirect to incorrect server URL.");
}