Remove extra eol from log stream.

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

diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index a454a6f..16a6bc1 100644 (file)
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -22,12 +22,14 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/MessageDecoder.h"
+#include "saml1/binding/SAML1MessageDecoder.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
 
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
 #include <xercesc/util/Base64.hpp>
 #include <xmltooling/logging.h>
 #include <xmltooling/io/HTTPRequest.h>
@@ -44,7 +46,7 @@ using namespace std;
 
 namespace opensaml {
     namespace saml1p {              
-        class SAML_DLLLOCAL SAML1POSTDecoder : public MessageDecoder
+        class SAML_DLLLOCAL SAML1POSTDecoder : public SAML1MessageDecoder
         {
         public:
             SAML1POSTDecoder() {}
@@ -84,21 +86,21 @@ XMLObject* SAML1POSTDecoder::decode(
     const char* samlResponse = httpRequest->getParameter("SAMLResponse");
     const char* TARGET = httpRequest->getParameter("TARGET");
     if (!samlResponse || !TARGET)
-        throw BindingException("Request missing SAMLResponse or TARGET parameters.");
+        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.
+    MemBufInputSource src(decoded, x, "SAMLResponse", true);
+    Wrapper4InputSource dsrc(&src, false);
     DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
-        : XMLToolingConfig::getConfig().getParser()).parse(is); 
+        : XMLToolingConfig::getConfig().getParser()).parse(dsrc); 
     XercesJanitor<DOMDocument> janitor(doc);
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
@@ -108,15 +110,18 @@ XMLObject* SAML1POSTDecoder::decode(
         throw BindingException("Decoded message was not a SAML 1.x Response.");
 
     if (!policy.getValidating())
-        SchemaValidators.validate(xmlObject.get());
-
-    // Run through the policy.
+        SchemaValidators.validate(response);
+    
     pair<bool,int> minor = response->getMinorVersion();
-    policy.evaluate(
+    extractMessageDetails(
         *response,
-        &genericRequest,
-        (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM
+        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());