X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2ArtifactEncoder.cpp;h=80626f5ed39560771bfe997d8d6b39cdab52efd7;hb=d60bac92f0747f2c9106441f852b083c9a850ff6;hp=749d83d6039a7f6707c77c259ae48fe27aa908aa;hpb=5d4b679f292a46494e822e9634f0ffa06f8f421c;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index 749d83d..80626f5 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-2009 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ /** * SAML2ArtifactEncoder.cpp * - * SAML 2.0 HTTP-Artifact binding message encoder + * SAML 2.0 HTTP-Artifact binding message encoder. */ #include "internal.h" @@ -27,12 +27,16 @@ #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 @@ -40,8 +44,8 @@ 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 { @@ -49,7 +53,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder { public: - SAML2ArtifactEncoder(const DOMElement* e); + SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns); virtual ~SAML2ArtifactEncoder() {} long encode( @@ -58,6 +62,7 @@ namespace opensaml { const char* destination, const EntityDescriptor* recipient=NULL, const char* relayState=NULL, + const ArtifactGenerator* artifactGenerator=NULL, const Credential* credential=NULL, const XMLCh* signatureAlg=NULL, const XMLCh* digestAlg=NULL @@ -68,9 +73,9 @@ namespace opensaml { 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); } }; @@ -78,15 +83,17 @@ namespace opensaml { static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t); }; -SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e) : m_post(false) +SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns) : m_post(false) { if (e) { - const XMLCh* flag = e->getAttributeNS(NULL, postArtifact); + const XMLCh* flag = e->getAttributeNS(ns, postArtifact); m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1)); if (m_post) { - auto_ptr_char t(e->getAttributeNS(NULL, _template)); - if (t.get()) + auto_ptr_char t(e->getAttributeNS(ns, _template)); + if (t.get() && *t.get()) { m_template = t.get(); + XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE); + } } } } @@ -97,6 +104,7 @@ long SAML2ArtifactEncoder::encode( const char* destination, const EntityDescriptor* recipient, const char* relayState, + const ArtifactGenerator* artifactGenerator, const Credential* credential, const XMLCh* signatureAlg, const XMLCh* digestAlg @@ -106,34 +114,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; 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."); auto_ptr_char recipientID(recipient ? recipient->getEntityID() : NULL); log.debug("obtaining new artifact for relying party (%s)", recipientID.get() ? recipientID.get() : "unknown"); - auto_ptr artifact(m_artifactGenerator->generateSAML2Artifact(recipient)); + auto_ptr artifact(artifactGenerator->generateSAML2Artifact(recipient)); if (credential) { // Signature based on native XML signing. @@ -159,6 +168,9 @@ long SAML2ArtifactEncoder::encode( xmlObject->marshall((DOMDocument*)NULL,&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"); @@ -181,6 +193,7 @@ 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())); @@ -192,6 +205,9 @@ long SAML2ArtifactEncoder::encode( 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); } }