/*
- * 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 "internal.h"
#include "exceptions.h"
-#include "saml/binding/SAMLArtifact.h"
-#include "saml1/binding/SAML1ArtifactDecoder.h"
+#include "binding/MessageDecoder.h"
+#include "binding/SAMLArtifact.h"
+#include "saml1/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
-#include "security/X509TrustEngine.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::saml1;
using namespace opensaml;
-using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml1p {
- MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const DOMElement* const & e)
+ class SAML_DLLLOCAL SAML1ArtifactDecoder : public MessageDecoder
{
- return new SAML1ArtifactDecoder(e);
+ public:
+ SAML1ArtifactDecoder() {}
+ virtual ~SAML1ArtifactDecoder() {}
+
+ xmltooling::XMLObject* decode(
+ std::string& relayState,
+ const GenericRequest& genericRequest,
+ SecurityPolicy& policy
+ ) const;
+ };
+
+ MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+ {
+ return new SAML1ArtifactDecoder();
}
};
};
-SAML1ArtifactDecoder::SAML1ArtifactDecoder(const DOMElement* e) {}
-
-SAML1ArtifactDecoder::~SAML1ArtifactDecoder() {}
-
-Response* SAML1ArtifactDecoder::decode(
+XMLObject* SAML1ArtifactDecoder::decode(
string& relayState,
- const RoleDescriptor*& issuer,
- bool& issuerTrusted,
- const HTTPRequest& httpRequest,
- const MetadataProvider* metadataProvider,
- const QName* role,
- const opensaml::TrustEngine* trustEngine
+ const GenericRequest& genericRequest,
+ SecurityPolicy& policy
) const
{
#ifdef _DEBUG
Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1Artifact");
log.debug("validating input");
- if (strcmp(httpRequest.getMethod(),"GET"))
- return NULL;
+ const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
+ if (!httpRequest)
+ throw BindingException("Unable to cast request object to HTTPRequest type.");
+ if (strcmp(httpRequest->getMethod(),"GET"))
+ throw BindingException("Invalid HTTP method ($1).", params(1, httpRequest->getMethod()));
vector<const char*> SAMLart;
- const char* TARGET = httpRequest.getParameter("TARGET");
- if (httpRequest.getParameters("SAMLart", SAMLart)==0 || !TARGET)
- return NULL;
+ const char* TARGET = httpRequest->getParameter("TARGET");
+ if (httpRequest->getParameters("SAMLart", SAMLart)==0 || !TARGET)
+ throw BindingException("Request missing SAMLart or TARGET parameters.");
relayState = TARGET;
- if (!m_artifactResolver || !metadataProvider)
- throw BindingException("Artifact binding requires ArtifactResolver and MetadataProvider implementations be supplied.");
+ if (!m_artifactResolver || !policy.getMetadataProvider() || !policy.getRole())
+ throw BindingException("Artifact profile requires ArtifactResolver and MetadataProvider implementations be supplied.");
// Import the artifacts.
vector<SAMLArtifact*> artifacts;
}
}
- issuer = NULL;
- issuerTrusted = false;
log.debug("attempting to determine source of artifact(s)...");
- const EntityDescriptor* provider=metadataProvider->getEntityDescriptor(artifacts.front());
+ const EntityDescriptor* provider=policy.getMetadataProvider()->getEntityDescriptor(artifacts.front());
if (!provider) {
log.error(
"metadata lookup failed, unable to determine issuer of artifact (0x%s)",
auto_ptr_char issuer(provider->getEntityID());
log.debug("lookup succeeded, 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...");
- issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML11_PROTOCOL_ENUM);
- if (!issuer)
- issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML10_PROTOCOL_ENUM);
- if (!issuer || !dynamic_cast<const IDPSSODescriptor*>(issuer)) {
- log.error("unable to find compatible SAML role (%s) in metadata", role->toString().c_str());
+ 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());
for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());
- BindingException ex("Unable to find compatible metadata role for artifact issuer.");
- annotateException(&ex,provider); // throws it
+ throw BindingException("Unable to find compatible metadata role for artifact issuer.");
}
+ policy.setIssuerMetadata(roledesc);
try {
+ log.debug("calling ArtifactResolver...");
auto_ptr<Response> response(
- m_artifactResolver->resolve(
- issuerTrusted,
- artifacts,
- dynamic_cast<const IDPSSODescriptor&>(*issuer),
- dynamic_cast<const X509TrustEngine*>(trustEngine)
- )
+ m_artifactResolver->resolve(artifacts, dynamic_cast<const IDPSSODescriptor&>(*roledesc), policy)
);
- if (trustEngine && response->getSignature()) {
- issuerTrusted = trustEngine->validate(*(response->getSignature()), *issuer, metadataProvider->getKeyResolver());
- if (!issuerTrusted) {
- log.error("unable to verify signature on message with supplied trust engine");
- throw BindingException("Message signature failed verification.");
- }
- }
- else if (!issuerTrusted) {
- log.warn("unable to verify integrity of the message, leaving untrusted");
- }
+ // The policy should be enforced against the Response by the resolve step.
for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());
return response.release();
}
- catch (XMLToolingException& ex) {
+ catch (XMLToolingException&) {
for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());
- annotateException(&ex,issuer,false);
throw;
}
}
projects / shibboleth / opensaml2.git / blobdiff