X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1POSTEncoder.cpp;h=f7c8ecd338d91c36670673b211d8458458580b6d;hb=25e13c8d1138bb4a9509e359eee3ce1c26becc27;hp=b43afe0a06fe4338edd9268c4b3fddf6ee48fa08;hpb=c2f3cb788f744ebb8d89b22e0676b68737abfa9f;p=shibboleth%2Fopensaml2.git

diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
index b43afe0..f7c8ecd 100644
--- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
@@ -28,8 +28,8 @@
 
 #include <fstream>
 #include <sstream>
-#include <log4cpp/Category.hh>
 #include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/TemplateEngine.h>
 
@@ -37,8 +37,8 @@ using namespace opensaml::saml1p;
 using namespace opensaml::saml2md;
 using namespace opensaml;
 using namespace xmlsignature;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
@@ -103,6 +103,10 @@ long SAML1POSTEncoder::encode(
 #endif
     Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1POST");
 
+    TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();
+    if (!engine)
+        throw BindingException("Encoding response using POST requires a TemplateEngine instance.");
+    
     log.debug("validating input");
     if (xmlObject->getParent())
         throw BindingException("Cannot encode XML content with parent.");
@@ -141,9 +145,14 @@ long SAML1POSTEncoder::encode(
         log.debug("marshalling the response");
         rootElement = response->marshall();
     }
-    
-    string xmlbuf;
+
+    // Push message into template.
+    TemplateEngine::TemplateParameters pmap;
+    string& xmlbuf = pmap.m_map["SAMLResponse"];
     XMLHelper::serialize(rootElement, xmlbuf);
+    log.debug("marshalled response:\n%s", xmlbuf.c_str());
+    
+    // Replace with base-64 encoded version.
     unsigned int len=0;
     XMLByte* out=Base64::encode(reinterpret_cast<const XMLByte*>(xmlbuf.data()),xmlbuf.size(),&len);
     if (out) {
@@ -155,20 +164,15 @@ long SAML1POSTEncoder::encode(
         throw BindingException("Base64 encoding of XML failed.");
     }
 
-    // Push message into template and send result to client.
+    // Fill in the rest of the data and send to the client.
     log.debug("message encoded, sending HTML form template to client");
-    TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();
-    if (!engine)
-        throw BindingException("Encoding response using POST requires a TemplateEngine instance.");
     ifstream infile(m_template.c_str());
     if (!infile)
         throw BindingException("Failed to open HTML template for POST response ($1).", params(1,m_template.c_str()));
-    TemplateEngine::TemplateParameters params;
-    params.m_map["action"] = destination;
-    params.m_map["SAMLResponse"] = xmlbuf;
-    params.m_map["TARGET"] = relayState;
+    pmap.m_map["action"] = destination;
+    pmap.m_map["TARGET"] = relayState;
     stringstream s;
-    engine->run(infile, s, params);
+    engine->run(infile, s, pmap);
     genericResponse.setContentType("text/html");
     long ret = genericResponse.sendResponse(s);