From 2f1c4cb020bf2e6e2158c80741915244a3faf039 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 20 Dec 2006 03:25:33 +0000 Subject: [PATCH] Virtualize template parameters. --- saml/saml1/binding/impl/SAML1POSTEncoder.cpp | 8 ++++---- saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp | 8 ++++---- saml/saml2/binding/impl/SAML2POSTEncoder.cpp | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp index 5c15044..e8d1836 100644 --- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp @@ -129,10 +129,10 @@ long SAML1POSTEncoder::encode( 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())); - map params; - params["action"] = destination; - params["SAMLResponse"] = xmlbuf; - params["TARGET"] = relayState; + TemplateEngine::TemplateParameters params; + params.m_map["action"] = destination; + params.m_map["SAMLResponse"] = xmlbuf; + params.m_map["TARGET"] = relayState; stringstream s; engine->run(infile, s, params); genericResponse.setContentType("text/html"); diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index a6445bd..1534860 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp @@ -148,11 +148,11 @@ long SAML2ArtifactEncoder::encode( 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())); - map params; - params["action"] = destination; - params["SAMLart"] = artifact->encode(); + TemplateEngine::TemplateParameters params; + params.m_map["action"] = destination; + params.m_map["SAMLart"] = artifact->encode(); if (relayState) - params["RelayState"] = relayState; + params.m_map["RelayState"] = relayState; stringstream s; engine->run(infile, s, params); httpResponse->setContentType("text/html"); diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp index 3c73d86..31c57d6 100644 --- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp @@ -120,12 +120,12 @@ long SAML2POSTEncoder::encode( rootElement = xmlObject->marshall((DOMDocument*)NULL,&sigs); // Start tracking data. - map pmap; + TemplateEngine::TemplateParameters pmap; if (relayState) - pmap["RelayState"] = relayState; + pmap.m_map["RelayState"] = relayState; // Base64 the message. - string& msg = pmap[(request ? "SAMLRequest" : "SAMLResponse")]; + string& msg = pmap.m_map[(request ? "SAMLRequest" : "SAMLResponse")]; XMLHelper::serialize(rootElement, msg); unsigned int len=0; XMLByte* out=Base64::encode(reinterpret_cast(msg.data()),msg.size(),&len); @@ -143,14 +143,14 @@ long SAML2POSTEncoder::encode( if (!sigAlgorithm) sigAlgorithm = DSIGConstants::s_unicodeStrURIRSA_SHA1; auto_ptr_char alg(sigAlgorithm); - pmap["SigAlg"] = alg.get(); + pmap.m_map["SigAlg"] = alg.get(); input = input + "&SigAlg=" + alg.get(); char sigbuf[1024]; memset(sigbuf,0,sizeof(sigbuf)); auto_ptr key(credResolver->getKey()); Signature::createRawSignature(key.get(), sigAlgorithm, input.c_str(), input.length(), sigbuf, sizeof(sigbuf)-1); - pmap["Signature"] = sigbuf; + pmap.m_map["Signature"] = sigbuf; } // Push message into template and send result to client. @@ -161,7 +161,7 @@ long SAML2POSTEncoder::encode( ifstream infile(m_template.c_str()); if (!infile) throw BindingException("Failed to open HTML template for POST message ($1).", params(1,m_template.c_str())); - pmap["action"] = destination; + pmap.m_map["action"] = destination; stringstream s; engine->run(infile, s, pmap); genericResponse.setContentType("text/html"); -- 2.1.4