/*
- * 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.
#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 <fstream>
#include <log4cpp/Category.hh>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/TemplateEngine.h>
+#include <xmltooling/util/URLEncoder.h>
using namespace opensaml::saml2p;
using namespace opensaml;
namespace opensaml {
namespace saml2p {
+ class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder
+ {
+ public:
+ SAML2ArtifactEncoder(const DOMElement* e);
+ virtual ~SAML2ArtifactEncoder() {}
+
+ 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;
+
+ private:
+ string m_template;
+ };
+
MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const DOMElement* const & e)
{
return new SAML2ArtifactEncoder(e);
};
};
-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);
SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e)
{
if (e) {
- auto_ptr_char t(e->getAttributeNS(NULL, templat));
+ 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 char* relayState,
- const CredentialResolver* credResolver,
- const XMLCh* sigAlgorithm
+ const Credential* credential,
+ const XMLCh* signatureAlg,
+ const XMLCh* digestAlg
) const
{
#ifdef _DEBUG
log.debug("obtaining new artifact for relying party (%s)", recipientID ? recipientID : "unknown");
auto_ptr<SAMLArtifact> artifact(m_artifactGenerator->generateSAML2Artifact(recipientID));
- 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);
}
}
// 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)
loc = loc + "&RelayState=" + escaper->encode(relayState);