#include "internal.h"
#include "exceptions.h"
-#include "binding/MessageDecoder.h"
#include "binding/SAMLArtifact.h"
+#include "saml1/binding/SAML1MessageDecoder.h"
#include "saml1/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/ReplayCache.h>
using namespace opensaml::saml2md;
using namespace opensaml::saml1p;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml1p {
- class SAML_DLLLOCAL SAML1ArtifactDecoder : public MessageDecoder
+ class SAML_DLLLOCAL SAML1ArtifactDecoder : public SAML1MessageDecoder
{
public:
SAML1ArtifactDecoder() {}
}
log.debug("attempting to determine source of artifact(s)...");
- const EntityDescriptor* provider=policy.getMetadataProvider()->getEntityDescriptor(artifacts.front());
- if (!provider) {
+ MetadataProvider::Criteria mc(artifacts.front(), policy.getRole(), samlconstants::SAML11_PROTOCOL_ENUM);
+ mc.protocol2 = samlconstants::SAML10_PROTOCOL_ENUM;
+ pair<const EntityDescriptor*,const RoleDescriptor*> provider=policy.getMetadataProvider()->getEntityDescriptor(mc);
+ if (!provider.first) {
log.error(
"metadata lookup failed, unable to determine issuer of artifact (0x%s)",
SAMLArtifact::toHex(artifacts.front()->getBytes()).c_str()
}
if (log.isDebugEnabled()) {
- auto_ptr_char issuer(provider->getEntityID());
- log.debug("lookup succeeded, artifact issued by (%s)", issuer.get());
+ auto_ptr_char issuer(provider.first->getEntityID());
+ log.debug("artifact issued by (%s)", issuer.get());
}
- // Mock up an Issuer object for the policy.
- auto_ptr<saml2::Issuer> issuer(saml2::IssuerBuilder::buildIssuer());
- issuer->setName(provider->getEntityID());
- policy.setIssuer(issuer.get());
- issuer.release(); // owned by policy now
-
- log.debug("attempting to find artifact issuing role...");
- const RoleDescriptor* roledesc=provider->getRoleDescriptor(*(policy.getRole()), samlconstants::SAML11_PROTOCOL_ENUM);
- if (!roledesc)
- roledesc=provider->getRoleDescriptor(*(policy.getRole()), samlconstants::SAML10_PROTOCOL_ENUM);
- if (!roledesc || !dynamic_cast<const IDPSSODescriptor*>(roledesc)) {
- log.error("unable to find compatible SAML role (%s) in metadata", policy.getRole()->toString().c_str());
+ if (!provider.second || !dynamic_cast<const IDPSSODescriptor*>(provider.second)) {
+ log.error("unable to find compatible SAML 1.x role (%s) in metadata", policy.getRole()->toString().c_str());
for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());
throw BindingException("Unable to find compatible metadata role for artifact issuer.");
}
- policy.setIssuerMetadata(roledesc);
+ // Set Issuer for the policy.
+ policy.setIssuer(provider.first->getEntityID());
+ policy.setIssuerMetadata(provider.second);
try {
log.debug("calling ArtifactResolver...");
auto_ptr<Response> response(
- m_artifactResolver->resolve(artifacts, dynamic_cast<const IDPSSODescriptor&>(*roledesc), policy)
+ m_artifactResolver->resolve(artifacts, dynamic_cast<const IDPSSODescriptor&>(*provider.second), policy)
);
// The policy should be enforced against the Response by the resolve step.