X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1POSTDecoder.cpp;h=16a6bc121b6e074350207957fd9b2ae97c7c1ac4;hb=8ad0f24af699bf221f6cb051b1eef62732ab32cc;hp=64cc627580d582f4a30947f6aa97a0f222c62938;hpb=2cf60ce131535beae932489d2d1e3d2355799061;p=shibboleth%2Fopensaml2.git

diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index 64cc627..16a6bc1 100644
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -22,14 +22,17 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/HTTPRequest.h"
+#include "saml1/binding/SAML1MessageDecoder.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/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
 #include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
+#include <xmltooling/io/HTTPRequest.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/validation/ValidatorSuite.h>
 
@@ -37,21 +40,32 @@ using namespace opensaml::saml2md;
 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 SAML1MessageDecoder
         {
-            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,
@@ -65,30 +79,28 @@ 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 form parameters.");
     relayState = TARGET;
 
-    // Decode the base64 into SAML.
+    // Decode the base64 into XML.
     unsigned int x;
     XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(samlResponse),&x);
     if (!decoded)
         throw BindingException("Unable to decode base64 in POST profile response.");
-    log.debug("decoded SAML response:\n%s", decoded);
-    istringstream is(reinterpret_cast<char*>(decoded));
-    XMLString::release(&decoded);
-    
+    log.debugStream() << "decoded SAML response:\n" << decoded << logging::eol;
+
     // Parse and bind the document into an XMLObject.
-    DOMDocument* doc = (m_validate ? XMLToolingConfig::getConfig().getValidatingParser()
-        : XMLToolingConfig::getConfig().getParser()).parse(is); 
+    MemBufInputSource src(decoded, x, "SAMLResponse", true);
+    Wrapper4InputSource dsrc(&src, false);
+    DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
+        : XMLToolingConfig::getConfig().getParser()).parse(dsrc); 
     XercesJanitor<DOMDocument> janitor(doc);
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
@@ -97,23 +109,32 @@ XMLObject* SAML1POSTDecoder::decode(
     if (!response)
         throw BindingException("Decoded message was not a SAML 1.x Response.");
 
-    if (!m_validate)
-        SchemaValidators.validate(xmlObject.get());
+    if (!policy.getValidating())
+        SchemaValidators.validate(response);
+    
+    pair<bool,int> minor = response->getMinorVersion();
+    extractMessageDetails(
+        *response,
+        genericRequest,
+        (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM,
+        policy
+        );
+
+    // Run through the policy.
+    policy.evaluate(*response,&genericRequest);
     
     // 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.");
     }
     
-    // Run through the policy.
-    policy.evaluate(*response, &genericRequest);
-
     return xmlObject.release();
 }