X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1ArtifactDecoder.cpp;h=75b92f3c9f283b8c9cb742f8c636469072e6fc0c;hp=ee5278ad197363632e23ae402b138acfb772567a;hb=1462057b3b9ae7e165d34d988e30b14c213672ca;hpb=1c199e2d851bf77015ce0b1d80ac2cc6ef60cda3 diff --git a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp index ee5278a..75b92f3 100644 --- a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp @@ -1,34 +1,41 @@ -/* - * 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. - * You may obtain a copy of the License at +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. */ /** * SAML1ArtifactDecoder.cpp - * + * * SAML 1.x Artifact binding/profile message decoder */ #include "internal.h" #include "exceptions.h" -#include "binding/MessageDecoder.h" #include "binding/SAMLArtifact.h" +#include "binding/SecurityPolicy.h" +#include "saml1/binding/SAML1MessageDecoder.h" #include "saml1/core/Protocols.h" #include "saml2/metadata/Metadata.h" #include "saml2/metadata/MetadataProvider.h" -#include +#include +#include +#include #include #include #include @@ -36,28 +43,29 @@ using namespace opensaml::saml2md; using namespace opensaml::saml1p; using namespace opensaml; +using namespace xmltooling::logging; using namespace xmltooling; -using namespace log4cpp; using namespace std; +using boost::ptr_vector; namespace opensaml { - namespace saml1p { - class SAML_DLLLOCAL SAML1ArtifactDecoder : public MessageDecoder + namespace saml1p { + class SAML_DLLLOCAL SAML1ArtifactDecoder : public SAML1MessageDecoder { public: - SAML1ArtifactDecoder(const DOMElement* e) {} + SAML1ArtifactDecoder() {} virtual ~SAML1ArtifactDecoder() {} - + xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy ) const; - }; + }; - MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const pair& p) { - return new SAML1ArtifactDecoder(e); + return new SAML1ArtifactDecoder(); } }; }; @@ -71,33 +79,32 @@ XMLObject* SAML1ArtifactDecoder::decode( #ifdef _DEBUG xmltooling::NDC ndc("decode"); #endif - Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1Artifact"); + Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1Artifact"); log.debug("validating input"); const HTTPRequest* httpRequest=dynamic_cast(&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 SAMLart; const char* TARGET = httpRequest->getParameter("TARGET"); if (httpRequest->getParameters("SAMLart", SAMLart)==0 || !TARGET) - throw BindingException("Request missing SAMLart or TARGET parameters."); + throw BindingException("Request missing SAMLart or TARGET query string parameters."); relayState = TARGET; if (!m_artifactResolver || !policy.getMetadataProvider() || !policy.getRole()) throw BindingException("Artifact profile requires ArtifactResolver and MetadataProvider implementations be supplied."); // Import the artifacts. - vector artifacts; + vector artifactptrs; // needed for compatibility with non-Boost API in ArtifactResolver + ptr_vector artifacts; for (vector::const_iterator raw=SAMLart.begin(); raw!=SAMLart.end(); ++raw) { try { log.debug("processing encoded artifact (%s)", *raw); - + // Check replay. ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache(); if (replayCache) { - if (!replayCache->check("SAML1Artifact", *raw, time(NULL) + (2*XMLToolingConfig::getConfig().clock_skew_secs))) { + if (!replayCache->check("SAML1Artifact", *raw, time(nullptr) + (2*XMLToolingConfig::getConfig().clock_skew_secs))) { log.error("replay detected of artifact (%s)", *raw); throw BindingException("Rejecting replayed artifact ($1).", params(1,*raw)); } @@ -106,64 +113,48 @@ XMLObject* SAML1ArtifactDecoder::decode( log.warn("replay cache was not provided, this is a serious security risk!"); artifacts.push_back(SAMLArtifact::parse(*raw)); + artifactptrs.push_back(&(artifacts.back())); } catch (ArtifactException&) { log.error("error parsing artifact (%s)", *raw); - for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup()); - throw; - } - catch (XMLToolingException&) { - for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup()); throw; } } - + log.debug("attempting to determine source of artifact(s)..."); - const EntityDescriptor* provider=policy.getMetadataProvider()->getEntityDescriptor(artifacts.front()); - if (!provider) { + MetadataProvider::Criteria& mc = policy.getMetadataProviderCriteria(); + mc.artifact = &(artifacts.front()); + mc.role = policy.getRole(); + mc.protocol = samlconstants::SAML11_PROTOCOL_ENUM; + mc.protocol2 = samlconstants::SAML10_PROTOCOL_ENUM; + pair 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() + SAMLArtifact::toHex(artifacts.front().getBytes()).c_str() ); - for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup()); throw BindingException("Metadata lookup failed, unable to determine artifact issuer"); } - + 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 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(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()); + if (!provider.second || !dynamic_cast(provider.second)) { + log.error("unable to find compatible SAML 1.x role (%s) in metadata", policy.getRole()->toString().c_str()); throw BindingException("Unable to find compatible metadata role for artifact issuer."); } - policy.setIssuerMetadata(roledesc); - - try { - log.debug("calling ArtifactResolver..."); - auto_ptr response( - m_artifactResolver->resolve(artifacts, dynamic_cast(*roledesc), policy) - ); - - // The policy should be enforced against the Response by the resolve step. - - for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup()); - return response.release(); - } - catch (XMLToolingException&) { - for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup()); - throw; - } + // Set Issuer for the policy. + policy.setIssuer(provider.first->getEntityID()); + policy.setIssuerMetadata(provider.second); + + log.debug("calling ArtifactResolver..."); + auto_ptr response( + m_artifactResolver->resolve(artifactptrs, dynamic_cast(*provider.second), policy) + ); + + // The policy should be enforced against the Response by the resolve step. + + return response.release(); }