#include "internal.h"
#include "exceptions.h"
#include "binding/ArtifactMap.h"
-#include "binding/HTTPResponse.h"
#include "binding/MessageEncoder.h"
-#include "binding/URLEncoder.h"
#include "saml2/binding/SAML2Artifact.h"
#include "saml2/core/Protocols.h"
+#include "saml2/metadata/Metadata.h"
#include <fstream>
#include <sstream>
#include <log4cpp/Category.hh>
+#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/TemplateEngine.h>
+#include <xmltooling/util/URLEncoder.h>
using namespace opensaml::saml2p;
+using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
using namespace xmltooling;
long encode(
GenericResponse& genericResponse,
- xmltooling::XMLObject* xmlObject,
+ XMLObject* xmlObject,
const char* destination,
- const char* recipientID=NULL,
+ const EntityDescriptor* recipient=NULL,
const char* relayState=NULL,
- const xmltooling::CredentialResolver* credResolver=NULL,
- const XMLCh* sigAlgorithm=NULL
+ const ArtifactGenerator* artifactGenerator=NULL,
+ const Credential* credential=NULL,
+ const XMLCh* signatureAlg=NULL,
+ const XMLCh* digestAlg=NULL
) const;
private:
- std::string m_template;
+ bool m_post;
+ string m_template;
};
MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const DOMElement* const & e)
return new SAML2ArtifactEncoder(e);
}
};
-};
-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) : m_post(false)
{
if (e) {
- auto_ptr_char t(e->getAttributeNS(NULL, _template));
- if (t.get())
- m_template = t.get();
+ const XMLCh* flag = e->getAttributeNS(NULL, postArtifact);
+ m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ if (m_post) {
+ auto_ptr_char t(e->getAttributeNS(NULL, _template));
+ if (t.get())
+ m_template = t.get();
+ }
}
}
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
StatusResponseType* response = NULL;
RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject);
- if (!request)
+ if (!request) {
response = dynamic_cast<StatusResponseType*>(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<SAMLArtifact> 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<SAMLArtifact> 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");
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<opensaml::ContentReference*>(sig->getContentReference());
+ if (cr)
+ cr->setDigestAlgorithm(digestAlg);
+ }
+
// Sign response while marshalling.
vector<Signature*> sigs(1,sig);
- xmlObject->marshall((DOMDocument*)NULL,&sigs);
+ xmlObject->marshall((DOMDocument*)NULL,&sigs,credential);
}
}
// 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());
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);