X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2Fimpl%2FArtifactMap.cpp;h=214e39f96622a9c11d52782fa8287261a61bb0fe;hb=f1208cd2f514700244816377443c4951dc22c848;hp=2abaecc6942dac02ae9f56ec6c11b6ebeee0c84a;hpb=0559a5cb760882cbe43382dfacfd0a028ade1069;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/binding/impl/ArtifactMap.cpp b/saml/binding/impl/ArtifactMap.cpp index 2abaecc..214e39f 100644 --- a/saml/binding/impl/ArtifactMap.cpp +++ b/saml/binding/impl/ArtifactMap.cpp @@ -1,17 +1,21 @@ -/* - * 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. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * 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. */ /** @@ -25,15 +29,20 @@ #include "binding/ArtifactMap.h" #include "binding/SAMLArtifact.h" -#include +#include #include +#include #include +#include #include +#include +#include #include +#include using namespace opensaml; +using namespace xmltooling::logging; using namespace xmltooling; -using namespace log4cpp; using namespace std; namespace opensaml { @@ -49,10 +58,11 @@ namespace opensaml { } void storeContent(XMLObject* content, const SAMLArtifact* artifact, const char* relyingParty, int TTL); XMLObject* retrieveContent(const SAMLArtifact* artifact, const char* relyingParty); + string getRelyingParty(const SAMLArtifact* artifact); private: struct SAML_DLLLOCAL Mapping { - Mapping() : m_xml(NULL), m_expires(0) {} + Mapping() : m_xml(nullptr), m_expires(0) {} XMLObject* m_xml; string m_relying; time_t m_expires; @@ -91,7 +101,7 @@ void ArtifactMappings::storeContent(XMLObject* content, const SAMLArtifact* arti Lock wrapper(m_lock); // Garbage collect any expired artifacts. - time_t now=time(NULL); + time_t now=time(nullptr); multimap::iterator stop=m_expMap.upper_bound(now); for (multimap::iterator i=m_expMap.begin(); i!=stop; m_expMap.erase(i++)) { delete m_artMap[i->second].m_xml; @@ -105,7 +115,7 @@ void ArtifactMappings::storeContent(XMLObject* content, const SAMLArtifact* arti if (relyingParty) m.m_relying = relyingParty; m.m_expires = now + TTL; - m_expMap.insert(make_pair(m.m_expires,hexed)); + m_expMap.insert(pair(m.m_expires,hexed)); } XMLObject* ArtifactMappings::retrieveContent(const SAMLArtifact* artifact, const char* relyingParty) @@ -128,34 +138,44 @@ XMLObject* ArtifactMappings::retrieveContent(const SAMLArtifact* artifact, const } } - if (time(NULL) >= i->second.m_expires) { + if (time(nullptr) >= i->second.m_expires) { removeMapping(i); throw BindingException("Requested artifact has expired."); } log.debug("resolved artifact for (%s)", relyingParty ? relyingParty : "unknown"); XMLObject* ret = i->second.m_xml; - i->second.m_xml = NULL; // clear member so it doesn't get deleted + i->second.m_xml = nullptr; // clear member so it doesn't get deleted removeMapping(i); return ret; } +string ArtifactMappings::getRelyingParty(const SAMLArtifact* artifact) +{ + map::iterator i=m_artMap.find(SAMLArtifact::toHex(artifact->getMessageHandle())); + if (i==m_artMap.end()) + throw BindingException("Requested artifact not in map or may have expired."); + return i->second.m_relying; +} + ArtifactMap::ArtifactMap(xmltooling::StorageService* storage, const char* context, unsigned int artifactTTL) - : m_storage(storage), m_context(context ? context : "opensaml::ArtifactMap"), m_mappings(NULL), m_artifactTTL(artifactTTL) + : m_storage(storage), m_context((context && *context) ? context : "opensaml::ArtifactMap"), m_mappings(nullptr), m_artifactTTL(artifactTTL) { if (!m_storage) m_mappings = new ArtifactMappings(); } ArtifactMap::ArtifactMap(const DOMElement* e, xmltooling::StorageService* storage) - : m_storage(storage), m_mappings(NULL), m_artifactTTL(180) + : m_storage(storage), m_mappings(nullptr), m_artifactTTL(180) { if (e) { - auto_ptr_char c(e->getAttributeNS(NULL, context)); + auto_ptr_char c(e->getAttributeNS(nullptr, context)); if (c.get() && *c.get()) m_context = c.get(); + else + m_context = "opensaml::ArtifactMap"; - const XMLCh* TTL = e->getAttributeNS(NULL, artifactTTL); + const XMLCh* TTL = e->getAttributeNS(nullptr, artifactTTL); if (TTL) { m_artifactTTL = XMLString::parseInt(TTL); if (!m_artifactTTL) @@ -185,17 +205,22 @@ void ArtifactMap::storeContent(XMLObject* content, const SAMLArtifact* artifact, // Build a DOM with the same document to store the relyingParty mapping. if (relyingParty) { auto_ptr_XMLCh temp(relyingParty); - root = root->getOwnerDocument()->createElementNS(NULL,Mapping); - root->setAttributeNS(NULL,_relyingParty,temp.get()); + root = root->getOwnerDocument()->createElementNS(nullptr,Mapping); + root->setAttributeNS(nullptr,_relyingParty,temp.get()); root->appendChild(content->getDOM()); } // Serialize the root element, whatever it is, for storage. string xmlbuf; XMLHelper::serialize(root, xmlbuf); - m_storage->createText( - m_context.c_str(), SAMLArtifact::toHex(artifact->getMessageHandle()).c_str(), xmlbuf.c_str(), time(NULL) + m_artifactTTL - ); + if (!m_storage->createText( + m_context.c_str(), + SAMLArtifact::toHex(artifact->getMessageHandle()).c_str(), + xmlbuf.c_str(), + time(nullptr) + m_artifactTTL + )) { + throw IOException("Attempt to insert duplicate artifact into map."); + } // Cleanup by destroying XML. delete content; @@ -206,26 +231,27 @@ XMLObject* ArtifactMap::retrieveContent(const SAMLArtifact* artifact, const char #ifdef _DEBUG xmltooling::NDC ndc("retrieveContent"); #endif + Category& log=Category::getInstance(SAML_LOGCAT".ArtifactMap"); if (!m_storage) return m_mappings->retrieveContent(artifact, relyingParty); + // Read the mapping and then delete it. string xmlbuf; string key = SAMLArtifact::toHex(artifact->getMessageHandle()); if (!m_storage->readText(m_context.c_str(), key.c_str(), &xmlbuf)) throw BindingException("Artifact not found in mapping database."); + m_storage->deleteText(m_context.c_str(), key.c_str()); + // Parse the data back into XML. istringstream is(xmlbuf); DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(is); XercesJanitor janitor(doc); - - Category& log=Category::getInstance(SAML_LOGCAT".ArtifactMap"); - m_storage->deleteText(m_context.c_str(), key.c_str()); // Check the root element. DOMElement* messageRoot = doc->getDocumentElement(); - if (XMLHelper::isNodeNamed(messageRoot, NULL, Mapping)) { - auto_ptr_char temp(messageRoot->getAttributeNS(NULL,_relyingParty)); + if (XMLHelper::isNodeNamed(messageRoot, nullptr, Mapping)) { + auto_ptr_char temp(messageRoot->getAttributeNS(nullptr,_relyingParty)); if (!relyingParty || strcmp(temp.get(),relyingParty)) { log.warn("request from (%s) for artifact issued to (%s)", relyingParty ? relyingParty : "unknown", temp.get()); throw BindingException("Unauthorized artifact mapping request."); @@ -240,3 +266,26 @@ XMLObject* ArtifactMap::retrieveContent(const SAMLArtifact* artifact, const char log.debug("resolved artifact for (%s)", relyingParty ? relyingParty : "unknown"); return xmlObject; } + +string ArtifactMap::getRelyingParty(const SAMLArtifact* artifact) +{ + if (!m_storage) + return m_mappings->getRelyingParty(artifact); + + string xmlbuf; + if (!m_storage->readText(m_context.c_str(), SAMLArtifact::toHex(artifact->getMessageHandle()).c_str(), &xmlbuf)) + throw BindingException("Artifact not found in mapping database."); + + // Parse the data back into XML. + istringstream is(xmlbuf); + DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(is); + XercesJanitor janitor(doc); + + // Check the root element. + DOMElement* messageRoot = doc->getDocumentElement(); + if (XMLHelper::isNodeNamed(messageRoot, nullptr, Mapping)) { + auto_ptr_char temp(messageRoot->getAttributeNS(nullptr,_relyingParty)); + return temp.get(); + } + return string(); +}