X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1POSTEncoder.cpp;h=5086cea1c25b1222a62460ec5da88de7f82bcdc2;hp=de3b37740995e0aa5961224fc9802c8bc257aae7;hb=1462057b3b9ae7e165d34d988e30b14c213672ca;hpb=0e738d39ba71958fe55692498c91fc6e6d402604 diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp index de3b377..5086cea 100644 --- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp @@ -1,42 +1,53 @@ -/* - * Copyright 2001-2007 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * http://www.apache.org/licenses/LICENSE-2.0 + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. */ /** * SAML1POSTEncoder.cpp * - * SAML 1.x POST binding/profile message encoder + * SAML 1.x POST binding/profile message encoder. */ #include "internal.h" #include "exceptions.h" #include "binding/MessageEncoder.h" +#include "signature/ContentReference.h" #include "saml1/core/Protocols.h" #include #include -#include #include +#include +#include +#include +#include +#include #include +#include #include 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 { @@ -44,60 +55,69 @@ namespace opensaml { class SAML_DLLLOCAL SAML1POSTEncoder : public MessageEncoder { public: - SAML1POSTEncoder(const DOMElement* e); + SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns); virtual ~SAML1POSTEncoder() {} - + + const XMLCh* getProtocolFamily() const { + return samlconstants::SAML11_PROTOCOL_ENUM; + } + long encode( GenericResponse& genericResponse, - xmltooling::XMLObject* xmlObject, + XMLObject* xmlObject, const char* destination, - const char* recipientID=NULL, - const char* relayState=NULL, - const xmltooling::CredentialResolver* credResolver=NULL, - const XMLCh* sigAlgorithm=NULL + const EntityDescriptor* recipient=nullptr, + const char* relayState=nullptr, + const ArtifactGenerator* artifactGenerator=nullptr, + const Credential* credential=nullptr, + const XMLCh* signatureAlg=nullptr, + const XMLCh* digestAlg=nullptr ) const; protected: /** Pathname of HTML template for transmission of message via POST. */ - std::string m_template; + string m_template; }; - MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const pair& p) { - return new SAML1POSTEncoder(e); + return new SAML1POSTEncoder(p.first, p.second); } }; }; static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e); -SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e) +SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns) + : m_template(XMLHelper::getAttrString(e, "bindingTemplate.html", _template, ns)) { - if (e) { - auto_ptr_char t(e->getAttributeNS(NULL, _template)); - if (t.get()) - m_template = t.get(); - } if (m_template.empty()) throw XMLToolingException("SAML1POSTEncoder requires template XML attribute."); + XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE); } long SAML1POSTEncoder::encode( GenericResponse& genericResponse, XMLObject* xmlObject, const char* destination, - const char* recipientID, + const EntityDescriptor* recipient, const char* relayState, - const CredentialResolver* credResolver, - const XMLCh* sigAlgorithm + const ArtifactGenerator* artifactGenerator, + const Credential* credential, + const XMLCh* signatureAlg, + const XMLCh* digestAlg ) const { #ifdef _DEBUG xmltooling::NDC ndc("encode"); #endif - Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1POST"); - + Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML1POST"); log.debug("validating input"); + + TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine(); + if (!engine || !destination) + throw BindingException("Encoding response using POST requires a TemplateEngine instance and a destination."); + HTTPResponse::sanitizeURL(destination); if (xmlObject->getParent()) throw BindingException("Cannot encode XML content with parent."); Response* response = dynamic_cast(xmlObject); @@ -106,8 +126,8 @@ long SAML1POSTEncoder::encode( if (!relayState) throw BindingException("SAML 1.x POST Encoder requires relay state (TARGET) value."); - DOMElement* rootElement = NULL; - if (credResolver) { + DOMElement* rootElement = nullptr; + if (credential) { // Signature based on native XML signing. if (response->getSignature()) { log.debug("response already signed, skipping signature operation"); @@ -116,47 +136,64 @@ long SAML1POSTEncoder::encode( log.debug("signing and marshalling the response"); // Build a Signature. - Signature* sig = buildSignature(credResolver, sigAlgorithm); + Signature* sig = SignatureBuilder::buildSignature(); response->setSignature(sig); + if (signatureAlg) + sig->setSignatureAlgorithm(signatureAlg); + if (digestAlg) { + opensaml::ContentReference* cr = dynamic_cast(sig->getContentReference()); + if (cr) + cr->setDigestAlgorithm(digestAlg); + } // Sign response while marshalling. vector sigs(1,sig); - rootElement = response->marshall((DOMDocument*)NULL,&sigs); + rootElement = response->marshall((DOMDocument*)nullptr,&sigs,credential); } } else { 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); - unsigned int len=0; + log.debug("marshalled response:\n%s", xmlbuf.c_str()); + + // Replace with base-64 encoded version. + xsecsize_t len=0; XMLByte* out=Base64::encode(reinterpret_cast(xmlbuf.data()),xmlbuf.size(),&len); if (out) { xmlbuf.erase(); xmlbuf.append(reinterpret_cast(out),len); +#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE XMLString::release(&out); +#else + XMLString::release((char**)&out); +#endif } else { 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"); + HTTPResponse* httpResponse = dynamic_cast(&genericResponse); + if (httpResponse) { + httpResponse->setResponseHeader("Expires", "01-Jan-1997 12:00:00 GMT"); + httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private"); + httpResponse->setResponseHeader("Pragma", "no-cache"); + } long ret = genericResponse.sendResponse(s); // Cleanup by destroying XML.