X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2ArtifactEncoder.cpp;h=138fbd2cfaea06f6d32da16296627f73baa02a36;hb=5e62d2c1fb43763b3d627e641a310a79992b01c0;hp=f397ebd21609662b87b299902cdb2006dd238640;hpb=f3a43f14f9dd53428f9e879bb489d6a4cf2674a8;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index f397ebd..138fbd2 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2007 Internet2 + * Copyright 2001-2010 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,29 +17,35 @@ /** * SAML2ArtifactEncoder.cpp * - * SAML 2.0 HTTP-Artifact binding message encoder + * SAML 2.0 HTTP-Artifact binding message encoder. */ #include "internal.h" #include "exceptions.h" #include "binding/ArtifactMap.h" -#include "binding/HTTPResponse.h" #include "binding/MessageEncoder.h" #include "saml2/binding/SAML2Artifact.h" #include "saml2/core/Protocols.h" +#include "saml2/metadata/Metadata.h" +#include "signature/ContentReference.h" #include #include -#include +#include +#include +#include +#include #include +#include #include #include using namespace opensaml::saml2p; +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 { @@ -47,39 +53,45 @@ namespace opensaml { class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder { public: - SAML2ArtifactEncoder(const DOMElement* e); + SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns); virtual ~SAML2ArtifactEncoder() {} - + + const XMLCh* getProtocolFamily() const { + return samlconstants::SAML20P_NS; + } + long encode( GenericResponse& genericResponse, XMLObject* xmlObject, const char* destination, - const char* recipientID=NULL, - const char* relayState=NULL, - const Credential* credential=NULL, - const XMLCh* signatureAlg=NULL, - const XMLCh* digestAlg=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; private: - string m_template; + string m_template; }; - MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const pair& p) { - return new SAML2ArtifactEncoder(e); + return new SAML2ArtifactEncoder(p.first, p.second); } }; -}; -static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e); + static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e); + static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t); +}; -SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e) +SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns) { - if (e) { - auto_ptr_char t(e->getAttributeNS(NULL, _template)); - if (t.get()) - m_template = t.get(); + if (XMLHelper::getAttrBool(e, false, postArtifact, ns)) { + m_template = XMLHelper::getAttrString(e, "bindingTemplate.html", _template, ns); + if (!m_template.empty()) + XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE); } } @@ -87,8 +99,9 @@ long SAML2ArtifactEncoder::encode( GenericResponse& genericResponse, XMLObject* xmlObject, const char* destination, - const char* recipientID, + const EntityDescriptor* recipient, const char* relayState, + const ArtifactGenerator* artifactGenerator, const Credential* credential, const XMLCh* signatureAlg, const XMLCh* digestAlg @@ -98,33 +111,35 @@ long SAML2ArtifactEncoder::encode( xmltooling::NDC ndc("encode"); #endif Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2Artifact"); - log.debug("validating input"); + if (!destination) + throw BindingException("Encoding response requires a destination."); HTTPResponse* httpResponse=dynamic_cast(&genericResponse); if (!httpResponse) throw BindingException("Unable to cast response interface to HTTPResponse type."); if (relayState && strlen(relayState)>80) throw BindingException("RelayState cannot exceed 80 bytes in length."); - if (xmlObject->getParent()) throw BindingException("Cannot encode XML content with parent."); - StatusResponseType* response = NULL; + StatusResponseType* response = nullptr; RequestAbstractType* request = dynamic_cast(xmlObject); - if (!request) + if (!request) { response = dynamic_cast(xmlObject); - if (!response) - throw BindingException("XML content for SAML 2.0 HTTP-Artifact Encoder must be a SAML 2.0 protocol message."); + if (!response) + throw BindingException("XML content for SAML 2.0 HTTP-Artifact Encoder must be a SAML 2.0 protocol message."); + } ArtifactMap* mapper = SAMLConfig::getConfig().getArtifactMap(); if (!mapper) throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires ArtifactMap be set in configuration."); // Obtain a fresh artifact. - if (!m_artifactGenerator) + if (!artifactGenerator) throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires an ArtifactGenerator instance."); - log.debug("obtaining new artifact for relying party (%s)", recipientID ? recipientID : "unknown"); - auto_ptr artifact(m_artifactGenerator->generateSAML2Artifact(recipientID)); + auto_ptr_char recipientID(recipient ? recipient->getEntityID() : nullptr); + log.debug("obtaining new artifact for relying party (%s)", recipientID.get() ? recipientID.get() : "unknown"); + auto_ptr artifact(artifactGenerator->generateSAML2Artifact(recipient)); if (credential) { // Signature based on native XML signing. @@ -147,13 +162,16 @@ long SAML2ArtifactEncoder::encode( // Sign response while marshalling. vector sigs(1,sig); - xmlObject->marshall((DOMDocument*)NULL,&sigs,credential); + xmlObject->marshall((DOMDocument*)nullptr,&sigs,credential); } } + + if (log.isDebugEnabled()) + log.debugStream() << "marshalled message:" << logging::eol << *xmlObject << logging::eol; // Store the message. Last step in storage will be to delete the XML. log.debug("storing artifact and content in map"); - mapper->storeContent(xmlObject, artifact.get(), recipientID); + mapper->storeContent(xmlObject, artifact.get(), recipientID.get()); if (m_template.empty()) { // Generate redirect. @@ -161,7 +179,7 @@ long SAML2ArtifactEncoder::encode( loc += (strchr(destination,'?') ? '&' : '?'); const URLEncoder* escaper = XMLToolingConfig::getConfig().getURLEncoder(); loc = loc + "SAMLart=" + escaper->encode(artifact->encode().c_str()); - if (relayState) + if (relayState && *relayState) loc = loc + "&RelayState=" + escaper->encode(relayState); log.debug("message encoded, sending redirect to client"); return httpResponse->sendRedirect(loc.c_str()); @@ -172,17 +190,21 @@ long SAML2ArtifactEncoder::encode( TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine(); if (!engine) throw BindingException("Encoding artifact using POST requires a TemplateEngine instance."); + HTTPResponse::sanitizeURL(destination); 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["SAMLart"] = artifact->encode(); - if (relayState) + if (relayState && *relayState) params.m_map["RelayState"] = relayState; stringstream s; engine->run(infile, s, params); httpResponse->setContentType("text/html"); + 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"); return httpResponse->sendResponse(s); } }