X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2Fimpl%2FArtifactMap.cpp;h=8403084b194d57482aba581ec3db9ff05cdd2c57;hb=551a60a197c8f2cacc0268ffc3485346adcb7da2;hp=0b61a7f8177b1d2999745e09c7d3b352d466a16e;hpb=932cfaae2176c2eba1a9938dc420591a9551a7f3;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/binding/impl/ArtifactMap.cpp b/saml/binding/impl/ArtifactMap.cpp index 0b61a7f..8403084 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,21 @@ #include "binding/ArtifactMap.h" #include "binding/SAMLArtifact.h" -#include +#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 +59,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; @@ -64,6 +75,11 @@ namespace opensaml { map m_artMap; multimap m_expMap; }; + + static const XMLCh artifactTTL[] = UNICODE_LITERAL_11(a,r,t,i,f,a,c,t,T,T,L); + static const XMLCh context[] = UNICODE_LITERAL_7(c,o,n,t,e,x,t); + static const XMLCh Mapping[] = UNICODE_LITERAL_7(M,a,p,p,i,n,g); + static const XMLCh _relyingParty[] = UNICODE_LITERAL_12(r,e,l,y,i,n,g,P,a,r,t,y); }; void ArtifactMappings::removeMapping(const map::iterator& i) @@ -86,7 +102,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; @@ -100,7 +116,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) @@ -123,33 +139,65 @@ 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; } -ArtifactMap::ArtifactMap(xmltooling::StorageService* storage, const char* context, int artifactTTL) - : m_storage(storage), m_context(context ? context : "opensaml::ArtifactMap"), m_mappings(NULL), m_artifactTTL(artifactTTL) +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) ? 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(nullptr), m_artifactTTL(180) +{ + if (e) { + auto_ptr_char c(e->getAttributeNS(nullptr, context)); + if (c.get() && *c.get()) { + m_context = c.get(); + if (storage && m_context.length() > m_storage->getCapabilities().getContextSize()) { + throw IOException("ArtifactMap context length exceeds capacity of storage service."); + } + } + else { + m_context = "opensaml::ArtifactMap"; + } + + const XMLCh* TTL = e->getAttributeNS(nullptr, artifactTTL); + if (TTL) { + m_artifactTTL = XMLString::parseInt(TTL); + if (!m_artifactTTL) + m_artifactTTL = 180; + } + } + + if (!m_storage) + m_mappings = new ArtifactMappings(); +} + ArtifactMap::~ArtifactMap() { delete m_mappings; } -static const XMLCh M[] = UNICODE_LITERAL_7(M,a,p,p,i,n,g); -static const XMLCh RP[] = UNICODE_LITERAL_12(r,e,l,y,i,n,g,P,a,r,t,y); - void ArtifactMap::storeContent(XMLObject* content, const SAMLArtifact* artifact, const char* relyingParty) { if (content->getParent()) @@ -163,17 +211,30 @@ 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,M); - root->setAttributeNS(NULL,RP,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 - ); + + // Use hex form of message handler as storage key unless it's too big. + string key = artifact->getMessageHandle(); + if (key.length() > m_storage->getCapabilities().getKeySize()) + key = SecurityHelper::doHash("SHA1", key.data(), key.length()); + else + key = SAMLArtifact::toHex(key); + + if (!m_storage->createText( + m_context.c_str(), + key.c_str(), + xmlbuf.c_str(), + time(nullptr) + m_artifactTTL + )) { + throw IOException("Attempt to insert duplicate artifact into map."); + } // Cleanup by destroying XML. delete content; @@ -184,26 +245,33 @@ 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); - + + // Use hex form of message handler as storage key unless it's too big. + string key = artifact->getMessageHandle(); + if (key.length() > m_storage->getCapabilities().getKeySize()) + key = SecurityHelper::doHash("SHA1", key.data(), key.length()); + else + key = SAMLArtifact::toHex(key); + + // 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, M)) { - auto_ptr_char temp(messageRoot->getAttributeNS(NULL,RP)); + 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."); @@ -218,3 +286,33 @@ 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); + + // Use hex form of message handler as storage key unless it's too big. + string key = artifact->getMessageHandle(); + if (key.length() > m_storage->getCapabilities().getKeySize()) + key = SecurityHelper::doHash("SHA1", key.data(), key.length()); + else + key = SAMLArtifact::toHex(key); + + string xmlbuf; + if (!m_storage->readText(m_context.c_str(), key.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(); +}