#include "internal.h"
#include "exceptions.h"
-#include "binding/HTTPResponse.h"
-#include "saml2/binding/SAML2SOAPEncoder.h"
+#include "binding/MessageEncoder.h"
+#include "signature/ContentReference.h"
#include "saml2/core/Protocols.h"
#include <sstream>
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
+#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/soap/SOAP.h>
using namespace opensaml::saml2p;
+using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
using namespace soap11;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml2p {
- MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const DOMElement* const & e)
+ class SAML_DLLLOCAL SAML2SOAPEncoder : public MessageEncoder
{
- return new SAML2SOAPEncoder(e);
+ public:
+ SAML2SOAPEncoder() {}
+ virtual ~SAML2SOAPEncoder() {}
+
+ bool isUserAgentPresent() const {
+ return false;
+ }
+
+ 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;
+ };
+
+ MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+ {
+ return new SAML2SOAPEncoder();
}
};
};
-SAML2SOAPEncoder::SAML2SOAPEncoder(const DOMElement* e) {}
-
long SAML2SOAPEncoder::encode(
GenericResponse& genericResponse,
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
}
DOMElement* rootElement = NULL;
- StatusResponseType* response = dynamic_cast<StatusResponseType*>(xmlObject);
- if (response) {
+ SignableObject* msg = dynamic_cast<SignableObject*>(xmlObject);
+ if (msg) {
try {
Envelope* env = EnvelopeBuilder::buildEnvelope();
Body* body = BodyBuilder::buildBody();
env->setBody(body);
- body->getUnknownXMLObjects().push_back(response);
- if (credResolver ) {
- if (response->getSignature()) {
- log.debug("response already signed, skipping signature operation");
+ body->getUnknownXMLObjects().push_back(msg);
+ if (credential) {
+ if (msg->getSignature()) {
+ log.debug("message already signed, skipping signature operation");
rootElement = env->marshall();
}
else {
- log.debug("signing and marshalling the response");
+ log.debug("signing the message and marshalling the envelope");
// Build a Signature.
- Signature* sig = buildSignature(credResolver, sigAlgorithm);
- response->setSignature(sig);
+ Signature* sig = SignatureBuilder::buildSignature();
+ msg->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.
+ // Sign message while marshalling.
vector<Signature*> sigs(1,sig);
- rootElement = env->marshall((DOMDocument*)NULL,&sigs);
+ rootElement = env->marshall((DOMDocument*)NULL,&sigs,credential);
}
}
else {
- log.debug("marshalling the response");
+ log.debug("marshalling the envelope");
rootElement = env->marshall();
}
stringstream s;
s << *rootElement;
- log.debug("sending serialized response");
+ log.debug("sending serialized envelope");
long ret = genericResponse.sendResponse(s);
// Cleanup by destroying XML.
catch (XMLToolingException&) {
// A bit weird...we have to "revert" things so that the response is isolated
// so the caller can free it.
- if (response->getParent()) {
- response->getParent()->detach();
- response->detach();
+ if (msg->getParent()) {
+ msg->getParent()->detach();
+ msg->detach();
}
throw;
}
Fault* fault = dynamic_cast<Fault*>(xmlObject);
if (fault) {
try {
- log.debug("building Envelope and marshalling Fault");
+ log.debug("building envelope and marshalling fault");
Envelope* env = EnvelopeBuilder::buildEnvelope();
Body* body = BodyBuilder::buildBody();
env->setBody(body);
Envelope* env = dynamic_cast<Envelope*>(xmlObject);
if (env) {
- log.debug("marshalling envelope");
- rootElement = env->marshall();
-
- bool error =
- (env->getBody() &&
- env->getBody()->hasChildren() &&
- dynamic_cast<Fault*>(env->getBody()->getUnknownXMLObjects().front()));
+ SignableObject* msg =
+ (env->getBody() && env->getBody()->hasChildren()) ?
+ dynamic_cast<SignableObject*>(env->getBody()->getUnknownXMLObjects().front()) : NULL;
+ if (msg && credential) {
+ if (msg->getSignature()) {
+ log.debug("message already signed, skipping signature operation");
+ rootElement = env->marshall();
+ }
+ else {
+ log.debug("signing the message and marshalling the envelope");
+
+ // Build a Signature.
+ Signature* sig = SignatureBuilder::buildSignature();
+ msg->setSignature(sig);
+ if (signatureAlg)
+ sig->setSignatureAlgorithm(signatureAlg);
+ if (digestAlg) {
+ opensaml::ContentReference* cr = dynamic_cast<opensaml::ContentReference*>(sig->getContentReference());
+ if (cr)
+ cr->setDigestAlgorithm(digestAlg);
+ }
+
+ // Sign message while marshalling.
+ vector<Signature*> sigs(1,sig);
+ rootElement = env->marshall((DOMDocument*)NULL,&sigs,credential);
+ }
+ }
+ else {
+ log.debug("marshalling the envelope");
+ rootElement = env->marshall();
+ }
string xmlbuf;
XMLHelper::serialize(rootElement, xmlbuf);
istringstream s(xmlbuf);
log.debug("sending serialized envelope");
+ bool error =
+ (env->getBody() &&
+ env->getBody()->hasChildren() &&
+ dynamic_cast<Fault*>(env->getBody()->getUnknownXMLObjects().front()));
long ret = error ? genericResponse.sendError(s) : genericResponse.sendResponse(s);
// Cleanup by destroying XML.
return ret;
}
- throw BindingException("XML content for SAML 2.0 SOAP Encoder must be a SAML 2.0 response or SOAP Fault/Envelope.");
+ throw BindingException("XML content for SAML 2.0 SOAP Encoder must be a SAML 2.0 message or SOAP Fault/Envelope.");
}
projects / shibboleth / cpp-opensaml.git / blobdiff