X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=fdf3b9b61db982f7da73350576297adebcd2a9d2;hp=66f8b8ac3544619b8e5e9d3963af2b71960bfc5b;hb=HEAD;hpb=d8a4f024b89272eae00618fc39e6127b6c191edd diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp index 66f8b8a..fdf3b9b 100644 --- a/saml/SAMLConfig.cpp +++ b/saml/SAMLConfig.cpp @@ -1,18 +1,21 @@ - -/* - * Copyright 2001-2009 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. */ /** @@ -45,6 +48,7 @@ #include "saml1/core/Assertions.h" #include "saml1/core/Protocols.h" #include "saml2/core/Protocols.h" +#include "saml2/metadata/EntityMatcher.h" #include "saml2/metadata/Metadata.h" #include "saml2/metadata/MetadataFilter.h" #include "saml2/metadata/MetadataProvider.h" @@ -52,18 +56,27 @@ #include #include +#include #include #include #include +#include + +#include +#include +#include #include #include #include +#include using namespace opensaml; using namespace xmlsignature; using namespace xmltooling::logging; using namespace xmltooling; +using namespace boost::lambda; +using namespace boost; using namespace std; // Expose entry points when used as an extension library @@ -103,12 +116,13 @@ SAMLInternalConfig& SAMLInternalConfig::getInternalConfig() return g_config; } -SAMLConfig::SAMLConfig() : m_artifactMap(NULL) +SAMLConfig::SAMLConfig() : m_artifactMap(nullptr) { } SAMLConfig::~SAMLConfig() { + delete m_artifactMap; } ArtifactMap* SAMLConfig::getArtifactMap() const @@ -122,16 +136,39 @@ void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap) m_artifactMap = artifactMap; } +SAMLInternalConfig::SAMLInternalConfig() : m_initCount(0), m_lock(Mutex::create()) +{ +} + +SAMLInternalConfig::~SAMLInternalConfig() +{ +} + bool SAMLInternalConfig::init(bool initXMLTooling) { #ifdef _DEBUG xmltooling::NDC ndc("init"); #endif - Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig"); + Category& log=Category::getInstance(SAML_LOGCAT ".Config"); + + Lock initLock(m_lock); + + if (m_initCount == INT_MAX) { + log.crit("library initialized too many times"); + return false; + } + + if (m_initCount >= 1) { + ++m_initCount; + return true; + } + log.debug("library initialization started"); - if (initXMLTooling) - XMLToolingConfig::getConfig().init(); + if (initXMLTooling && !XMLToolingConfig::getConfig().init()) { + return false; + } + XMLToolingConfig::getConfig().getPathResolver()->setDefaultPackageName("opensaml"); REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml); @@ -150,12 +187,17 @@ bool SAMLInternalConfig::init(bool initXMLTooling) saml2md::registerMetadataClasses(); saml2md::registerMetadataProviders(); saml2md::registerMetadataFilters(); + saml2md::registerEntityMatchers(); registerSAMLArtifacts(); registerMessageEncoders(); registerMessageDecoders(); registerSecurityPolicyRules(); + m_contactPriority.push_back(saml2md::ContactPerson::CONTACT_SUPPORT); + m_contactPriority.push_back(saml2md::ContactPerson::CONTACT_TECHNICAL); + log.info("%s library initialization complete", PACKAGE_STRING); + ++m_initCount; return true; } @@ -164,22 +206,31 @@ void SAMLInternalConfig::term(bool termXMLTooling) #ifdef _DEBUG xmltooling::NDC ndc("term"); #endif - Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig"); + + Lock initLock(m_lock); + if (m_initCount == 0) { + Category::getInstance(SAML_LOGCAT ".Config").crit("term without corresponding init"); + return; + } + else if (--m_initCount > 0) { + return; + } MessageDecoderManager.deregisterFactories(); MessageEncoderManager.deregisterFactories(); SecurityPolicyRuleManager.deregisterFactories(); SAMLArtifactManager.deregisterFactories(); + EntityMatcherManager.deregisterFactories(); MetadataFilterManager.deregisterFactories(); MetadataProviderManager.deregisterFactories(); delete m_artifactMap; - m_artifactMap = NULL; + m_artifactMap = nullptr; if (termXMLTooling) XMLToolingConfig::getConfig().term(); - log.info("%s library shutdown complete", PACKAGE_STRING); + Category::getInstance(SAML_LOGCAT ".Config").info("%s library shutdown complete", PACKAGE_STRING); } void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len) @@ -196,8 +247,8 @@ void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len) void SAMLInternalConfig::generateRandomBytes(std::string& buf, unsigned int len) { buf.erase(); - auto_ptr hold(new unsigned char[len]); - generateRandomBytes(hold.get(),len); + auto_arrayptr hold(new unsigned char[len]); + generateRandomBytes(const_cast(hold.get()), len); for (unsigned int i=0; i hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1()); - if (hasher.get()) { - unsigned char buf[21]; - hasher->hash(reinterpret_cast(const_cast(s)),strlen(s)); - if (hasher->finish(buf,20)==20) { - string ret; - if (toHex) { - for (unsigned int i=0; i<20; i++) { - ret+=(DIGITS[((unsigned char)(0xF0 & buf[i])) >> 4 ]); - ret+=(DIGITS[0x0F & buf[i]]); - } - } - else { - for (unsigned int i=0; i<20; i++) { - ret+=buf[i]; - } - } - return ret; - } + return SecurityHelper::doHash("SHA1", s, strlen(s), toHex); +} + +void SAMLInternalConfig::setContactPriority(const XMLCh* contactTypes) +{ + const XMLCh* ctype; + m_contactPriority.clear(); + XMLStringTokenizer tokens(contactTypes); + while (tokens.hasMoreTokens()) { + ctype = tokens.nextToken(); + if (ctype && *ctype) + m_contactPriority.push_back(ctype); + } +} + +using namespace saml2md; + +const ContactPerson* SAMLInternalConfig::getContactPerson(const EntityDescriptor& entity) const +{ + for (vector::const_iterator ctype = m_contactPriority.begin(); ctype != m_contactPriority.end(); ++ctype) { + const ContactPerson* cp = find_if(entity.getContactPersons(), *ctype == lambda::bind(&ContactPerson::getContactType, _1)); + if (cp) + return cp; + } + return nullptr; +} + +const ContactPerson* SAMLInternalConfig::getContactPerson(const RoleDescriptor& role) const +{ + for (vector::const_iterator ctype = m_contactPriority.begin(); ctype != m_contactPriority.end(); ++ctype) { + const ContactPerson* cp = find_if(role.getContactPersons(), *ctype == lambda::bind(&ContactPerson::getContactType, _1)); + if (cp) + return cp; } - throw XMLSecurityException("Unable to generate SHA-1 hash."); + return getContactPerson(*(dynamic_cast(role.getParent()))); } SignableObject::SignableObject() @@ -266,20 +329,30 @@ Assertion::~Assertion() { } -using namespace saml2p; -using namespace saml2md; +Status::Status() +{ +} + +Status::~Status() +{ +} void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, const Status* status, bool rethrow) { - const RoleDescriptor* role = NULL; + time_t now = time(nullptr); + const RoleDescriptor* role = nullptr; + static bool (TimeBoundSAMLObject::* isValid)(time_t) const = &TimeBoundSAMLObject::isValid; + if (entity) { - const list& roles=entity->getOrderedChildren(); - for (list::const_iterator child=roles.begin(); !role && child!=roles.end(); ++child) { - role=dynamic_cast(*child); - if (role && !role->isValid()) - role = NULL; - } + const XMLObject* r = find_if( + entity->getOrderedChildren(), + (ll_dynamic_cast(_1) != ((const RoleDescriptor*)nullptr) && + lambda::bind(isValid, ll_dynamic_cast(_1), now)) + ); + if (r) + role = dynamic_cast(r); } + annotateException(e, role, status, rethrow); } @@ -289,30 +362,32 @@ void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* r auto_ptr_char id(dynamic_cast(role->getParent())->getEntityID()); e->addProperty("entityID",id.get()); - const vector& contacts=role->getContactPersons(); - for (vector::const_iterator c=contacts.begin(); c!=contacts.end(); ++c) { - const XMLCh* ctype=(*c)->getContactType(); - if (ctype && (XMLString::equals(ctype,ContactPerson::CONTACT_SUPPORT) - || XMLString::equals(ctype,ContactPerson::CONTACT_TECHNICAL))) { - GivenName* fname=(*c)->getGivenName(); - SurName* lname=(*c)->getSurName(); - auto_ptr_char first(fname ? fname->getName() : NULL); - auto_ptr_char last(lname ? lname->getName() : NULL); - if (first.get() && last.get()) { - string contact=string(first.get()) + ' ' + last.get(); - e->addProperty("contactName",contact.c_str()); - } - else if (first.get()) - e->addProperty("contactName",first.get()); - else if (last.get()) - e->addProperty("contactName",last.get()); - const vector& emails=const_cast(*c)->getEmailAddresss(); - if (!emails.empty()) { - auto_ptr_char email(emails.front()->getAddress()); - if (email.get()) - e->addProperty("contactEmail",email.get()); + const ContactPerson* cp = SAMLConfig::getConfig().getContactPerson(*role); + if (cp) { + GivenName* fname = cp->getGivenName(); + SurName* lname = cp->getSurName(); + auto_ptr_char first(fname ? fname->getName() : nullptr); + auto_ptr_char last(lname ? lname->getName() : nullptr); + if (first.get() && last.get()) { + string contact=string(first.get()) + ' ' + last.get(); + e->addProperty("contactName", contact.c_str()); + } + else if (first.get()) + e->addProperty("contactName", first.get()); + else if (last.get()) + e->addProperty("contactName", last.get()); + const vector& emails=cp->getEmailAddresss(); + if (!emails.empty()) { + auto_ptr_char email(emails.front()->getAddress()); + if (email.get()) { + if (strstr(email.get(), "mailto:") == email.get()) { + e->addProperty("contactEmail", email.get()); + } + else { + string addr = string("mailto:") + email.get(); + e->addProperty("contactEmail", addr.c_str()); + } } - break; } } @@ -321,18 +396,18 @@ void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* r e->addProperty("errorURL",eurl.get()); } } - + if (status) { - auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : NULL); + auto_ptr_char sc(status->getTopStatus()); if (sc.get() && *sc.get()) e->addProperty("statusCode", sc.get()); - if (status->getStatusCode()->getStatusCode()) { - auto_ptr_char sc2(status->getStatusCode()->getStatusCode()->getValue()); + if (status->getSubStatus()) { + auto_ptr_char sc2(status->getSubStatus()); if (sc2.get() && *sc.get()) e->addProperty("statusCode2", sc2.get()); } - if (status->getStatusMessage()) { - auto_ptr_char msg(status->getStatusMessage()->getMessage()); + if (status->getMessage()) { + auto_ptr_char msg(status->getMessage()); if (msg.get() && *msg.get()) e->addProperty("statusMessage", msg.get()); }