X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2ArtifactEncoder.cpp;h=a4dd248690f3daeaef03fba892ef6386d4c6b195;hb=3092c5498ee4bdd7df0562e4c5e1a4a9d984fafb;hp=1534860d3c831c6778c1fe713b0b99338dc8ec56;hpb=a2f9be1ae896e77ff62cfb5153f20e86b069fc29;p=shibboleth%2Fopensaml2.git diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index 1534860..a4dd248 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2006 Internet2 + * 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. @@ -23,53 +23,88 @@ #include "internal.h" #include "exceptions.h" #include "binding/ArtifactMap.h" -#include "binding/HTTPResponse.h" -#include "binding/URLEncoder.h" +#include "binding/MessageEncoder.h" #include "saml2/binding/SAML2Artifact.h" -#include "saml2/binding/SAML2ArtifactEncoder.h" #include "saml2/core/Protocols.h" +#include "saml2/metadata/Metadata.h" #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 { namespace saml2p { - MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const DOMElement* const & e) + class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder { - return new SAML2ArtifactEncoder(e); + public: + SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns); + virtual ~SAML2ArtifactEncoder() {} + + long encode( + GenericResponse& genericResponse, + XMLObject* xmlObject, + 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 + ) const; + + private: + bool m_post; + string m_template; + }; + + MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const pair& p) + { + return new SAML2ArtifactEncoder(p.first, p.second); } }; -}; -static const XMLCh templat[] = 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) : m_post(false) { if (e) { - auto_ptr_char t(e->getAttributeNS(NULL, templat)); - if (t.get()) - m_template = t.get(); + 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(ns, _template)); + if (t.get() && *t.get()) { + m_template = t.get(); + XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE); + } + } } } long SAML2ArtifactEncoder::encode( GenericResponse& genericResponse, - xmltooling::XMLObject* xmlObject, + 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 @@ -89,22 +124,24 @@ long SAML2ArtifactEncoder::encode( 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."); - 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() : NULL); + log.debug("obtaining new artifact for relying party (%s)", recipientID.get() ? recipientID.get() : "unknown"); + auto_ptr artifact(artifactGenerator->generateSAML2Artifact(recipient)); - if (credResolver) { + if (credential) { // Signature based on native XML signing. if (request ? request->getSignature() : response->getSignature()) { log.debug("message already signed, skipping signature operation"); @@ -113,28 +150,36 @@ long SAML2ArtifactEncoder::encode( log.debug("signing the message"); // Build a Signature. - Signature* sig = buildSignature(credResolver, sigAlgorithm); - - // Append Signature. + Signature* sig = SignatureBuilder::buildSignature(); request ? request->setSignature(sig) : 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); - xmlObject->marshall((DOMDocument*)NULL,&sigs); + 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"); - mapper->storeContent(xmlObject, artifact.get(), recipientID); + mapper->storeContent(xmlObject, artifact.get(), recipientID.get()); if (m_template.empty()) { // Generate redirect. string loc = destination; loc += (strchr(destination,'?') ? '&' : '?'); - URLEncoder* escaper = SAMLConfig::getConfig().getURLEncoder(); + 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()); @@ -151,7 +196,7 @@ long SAML2ArtifactEncoder::encode( 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);