#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::saml2;
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
class SAML_DLLLOCAL SAML2RedirectDecoder : public MessageDecoder
{
public:
- SAML2RedirectDecoder(const DOMElement* e) {}
+ SAML2RedirectDecoder() {}
virtual ~SAML2RedirectDecoder() {}
xmltooling::XMLObject* decode(
) const;
};
- MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const DOMElement* const & e)
+ MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new SAML2RedirectDecoder(e);
+ return new SAML2RedirectDecoder();
}
};
};
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(),"GET"))
- return NULL;
+ throw BindingException("Invalid HTTP method ($1).", params(1, httpRequest->getMethod()));
const char* msg = httpRequest->getParameter("SAMLResponse");
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
- return NULL;
+ throw BindingException("Request missing SAMLRequest or SAMLResponse parameter.");
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
state = httpRequest->getParameter("SAMLEncoding");
if (state && strcmp(state,samlconstants::SAML20_BINDING_URL_ENCODING_DEFLATE)) {
log.warn("SAMLEncoding (%s) was not recognized", state);
- return NULL;
+ throw BindingException("Unsupported SAMLEncoding value.");
}
// Decode the compressed message into SAML. First we base64-decode it.
SchemaValidators.validate(xmlObject.get());
// Run through the policy.
- policy.evaluate(*root, &genericRequest);
+ policy.evaluate(*root, &genericRequest, samlconstants::SAML20P_NS);
// Check destination URL.
auto_ptr_char dest(request ? request->getDestination() : response->getDestination());
const char* dest2 = httpRequest->getRequestURL();
+ const char* delim = strchr(dest2, '?');
if ((root->getSignature() || httpRequest->getParameter("Signature")) && (!dest.get() || !*(dest.get()))) {
log.error("signed SAML message missing Destination attribute");
throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
}
- else if (dest.get() && (!dest2 || !*dest2 || strcmp(dest.get(),dest2))) {
- log.error("Redirect targeted at (%s), but delivered to (%s)", dest.get(), dest2 ? dest2 : "none");
+ 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.");
}