Recipient/Destination checks were including query string.

[shibboleth/cpp-opensaml.git] / saml / saml1 / binding / impl / SAML1POSTDecoder.cpp

diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index de2d1d2..bc00f7f 100644 (file)
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -22,7 +22,6 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/HTTPRequest.h"
 #include "binding/MessageDecoder.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
@@ -31,6 +30,7 @@
 
 #include <log4cpp/Category.hh>
 #include <xercesc/util/Base64.hpp>
+#include <xmltooling/io/HTTPRequest.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/validation/ValidatorSuite.h>
 
@@ -47,7 +47,7 @@ namespace opensaml {
         class SAML_DLLLOCAL SAML1POSTDecoder : public MessageDecoder
         {
         public:
-            SAML1POSTDecoder(const DOMElement* e) {}
+            SAML1POSTDecoder() {}
             virtual ~SAML1POSTDecoder() {}
             
             xmltooling::XMLObject* decode(
@@ -57,9 +57,9 @@ namespace opensaml {
                 ) const;
         };                
 
-        MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const DOMElement* const & e)
+        MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
         {
-            return new SAML1POSTDecoder(e);
+            return new SAML1POSTDecoder();
         }
     };
 };
@@ -77,16 +77,14 @@ XMLObject* SAML1POSTDecoder::decode(
 
     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.
@@ -118,12 +116,13 @@ XMLObject* SAML1POSTDecoder::decode(
     // 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.");
     }