/*
- * Copyright 2001-2007 Internet2
+ * Copyright 2001-2010 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "saml1/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
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 {
class SAML_DLLLOCAL SAML1ArtifactEncoder : public MessageEncoder
{
public:
- SAML1ArtifactEncoder(const DOMElement* e) {}
+ SAML1ArtifactEncoder() {}
virtual ~SAML1ArtifactEncoder() {}
long encode(
GenericResponse& genericResponse,
XMLObject* xmlObject,
const char* destination,
- const EntityDescriptor* recipient=NULL,
- const char* relayState=NULL,
- const Credential* credential=NULL,
- const XMLCh* signatureAlg=NULL,
- const XMLCh* digestAlg=NULL
+ const EntityDescriptor* recipient=nullptr,
+ const char* relayState=nullptr,
+ const ArtifactGenerator* artifactGenerator=nullptr,
+ const Credential* credential=nullptr,
+ const XMLCh* signatureAlg=nullptr,
+ const XMLCh* digestAlg=nullptr
) const;
};
- MessageEncoder* SAML_DLLLOCAL SAML1ArtifactEncoderFactory(const DOMElement* const & e)
+ MessageEncoder* SAML_DLLLOCAL SAML1ArtifactEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new SAML1ArtifactEncoder(e);
+ return new SAML1ArtifactEncoder();
}
};
};
const char* destination,
const EntityDescriptor* recipient,
const char* relayState,
+ const ArtifactGenerator* artifactGenerator,
const Credential* credential,
const XMLCh* signatureAlg,
const XMLCh* digestAlg
throw BindingException("SAML 1.x Artifact Encoder requires ArtifactMap be set in configuration.");
// Obtain a fresh artifact.
- if (!m_artifactGenerator)
+ if (!artifactGenerator)
throw BindingException("SAML 1.x Artifact Encoder requires an ArtifactGenerator instance.");
- auto_ptr_char recipientID(recipient ? recipient->getEntityID() : NULL);
+
+ if (log.isDebugEnabled())
+ log.debugStream() << "marshalled assertion:" << logging::eol << *xmlObject << logging::eol;
+
+ auto_ptr_char recipientID(recipient ? recipient->getEntityID() : nullptr);
log.debug("obtaining new artifact for relying party (%s)", recipientID.get() ? recipientID.get() : "unknown");
- auto_ptr<SAMLArtifact> artifact(m_artifactGenerator->generateSAML1Artifact(recipient));
+ auto_ptr<SAMLArtifact> artifact(artifactGenerator->generateSAML1Artifact(recipient));
// Store the assertion. Last step in storage will be to delete the XML.
log.debug("storing artifact and content in map");