X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2ArtifactDecoder.cpp;h=336ddabe7de1b3324d8af105eba48d1d661f14a2;hb=f1208cd2f514700244816377443c4951dc22c848;hp=cb83ce7c7d2393d3ae77bf026fd09134836fce18;hpb=5cd3da8d9bd792f4a24372ab8e6d24b8409df41a;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp index cb83ce7..336ddab 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp @@ -1,27 +1,32 @@ -/* - * 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. */ /** * SAML2ArtifactDecoder.cpp - * - * SAML 2.0 Artifact binding message decoder + * + * SAML 2.0 Artifact binding message decoder. */ #include "internal.h" #include "exceptions.h" +#include "binding/SecurityPolicy.h" #include "saml2/binding/SAML2Artifact.h" #include "saml2/binding/SAML2MessageDecoder.h" #include "saml2/core/Protocols.h" @@ -29,6 +34,7 @@ #include "saml2/metadata/MetadataProvider.h" #include +#include #include #include #include @@ -42,19 +48,19 @@ using namespace xmltooling; using namespace std; namespace opensaml { - namespace saml2p { + namespace saml2p { class SAML_DLLLOCAL SAML2ArtifactDecoder : public SAML2MessageDecoder { public: SAML2ArtifactDecoder() {} virtual ~SAML2ArtifactDecoder() {} - + xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy ) const; - }; + }; MessageDecoder* SAML_DLLLOCAL SAML2ArtifactDecoderFactory(const pair& p) { @@ -80,7 +86,7 @@ XMLObject* SAML2ArtifactDecoder::decode( throw BindingException("Unable to cast request object to HTTPRequest type."); const char* SAMLart = httpRequest->getParameter("SAMLart"); if (!SAMLart) - throw BindingException("Request missing SAMLart parameter."); + throw BindingException("Request missing SAMLart query string or form parameter."); const char* state = httpRequest->getParameter("RelayState"); if (state) relayState = state; @@ -89,14 +95,14 @@ XMLObject* SAML2ArtifactDecoder::decode( throw BindingException("Artifact binding requires ArtifactResolver and MetadataProvider implementations be supplied."); // Import the artifact. - SAMLArtifact* artifact=NULL; + SAMLArtifact* artifact=nullptr; try { log.debug("processing encoded artifact (%s)", SAMLart); - + // Check replay. ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache(); if (replayCache) { - if (!replayCache->check("SAML2Artifact", SAMLart, time(NULL) + (2*XMLToolingConfig::getConfig().clock_skew_secs))) { + if (!replayCache->check("SAML2Artifact", SAMLart, time(nullptr) + (2*XMLToolingConfig::getConfig().clock_skew_secs))) { log.error("replay detected of artifact (%s)", SAMLart); throw BindingException("Rejecting replayed artifact ($1).", params(1,SAMLart)); } @@ -110,16 +116,20 @@ XMLObject* SAML2ArtifactDecoder::decode( log.error("error parsing artifact (%s)", SAMLart); throw; } - + // Check the type. auto_ptr artifact2(dynamic_cast(artifact)); if (!artifact2.get()) { - throw BindingException("Artifact binding requires SAML 2.0 artifact."); delete artifact; + log.error("wrong artifact type"); + throw BindingException("Artifact binding requires SAML 2.0 artifact."); } - + log.debug("attempting to determine source of artifact..."); - MetadataProvider::Criteria mc(artifact, policy.getRole(), samlconstants::SAML20P_NS); + MetadataProvider::Criteria& mc = policy.getMetadataProviderCriteria(); + mc.artifact = artifact; + mc.role = policy.getRole(); + mc.protocol = samlconstants::SAML20P_NS; pair provider=policy.getMetadataProvider()->getEntityDescriptor(mc); if (!provider.first) { log.error( @@ -128,7 +138,7 @@ XMLObject* SAML2ArtifactDecoder::decode( ); throw BindingException("Metadata lookup failed, unable to determine artifact issuer."); } - + if (log.isDebugEnabled()) { auto_ptr_char issuer(provider.first->getEntityID()); log.debug("lookup succeeded, artifact issued by (%s)", issuer.get()); @@ -141,23 +151,27 @@ XMLObject* SAML2ArtifactDecoder::decode( // Set issuer into policy. policy.setIssuer(provider.first->getEntityID()); policy.setIssuerMetadata(provider.second); - + log.debug("calling ArtifactResolver..."); auto_ptr response( m_artifactResolver->resolve(*(artifact2.get()), dynamic_cast(*provider.second), policy) ); - + // The policy should be enforced against the ArtifactResponse by the resolve step. // Reset only the message state. policy.reset(true); // Now extract details from the payload and check that message. XMLObject* payload = response->getPayload(); + if (!payload) { + log.error("ArtifactResponse message did not contain a protocol message"); + throw BindingException("ArtifactResponse message did not contain a protocol message."); + } extractMessageDetails(*payload, genericRequest, samlconstants::SAML20P_NS, policy); policy.evaluate(*payload, &genericRequest); // Return the payload only. response.release(); - payload->detach(); + payload->detach(); return payload; }