-
-/*
- * 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.
*/
/**
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/PathResolver.h>
+#include <xmltooling/util/Threads.h>
+
+#include <boost/lambda/bind.hpp>
+#include <boost/lambda/casts.hpp>
+#include <boost/lambda/lambda.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
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
return g_config;
}
-SAMLConfig::SAMLConfig() : m_artifactMap(NULL)
+SAMLConfig::SAMLConfig() : m_artifactMap(nullptr)
{
}
SAMLConfig::~SAMLConfig()
{
+ delete m_artifactMap;
}
ArtifactMap* SAMLConfig::getArtifactMap() const
m_artifactMap = artifactMap;
}
+SAMLInternalConfig::SAMLInternalConfig() : m_initCount(0), m_lock(Mutex::create())
+{
+}
+
+SAMLInternalConfig::~SAMLInternalConfig()
+{
+ delete m_lock;
+}
+
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);
registerSecurityPolicyRules();
log.info("%s library initialization complete", PACKAGE_STRING);
+ ++m_initCount;
return true;
}
#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();
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)
void SAMLInternalConfig::generateRandomBytes(std::string& buf, unsigned int len)
{
buf.erase();
- auto_ptr<unsigned char> hold(new unsigned char[len]);
- generateRandomBytes(hold.get(),len);
+ auto_arrayptr<unsigned char> hold(new unsigned char[len]);
+ generateRandomBytes(const_cast<unsigned char*>(hold.get()), len);
for (unsigned int i=0; i<len; i++)
buf+=(hold.get())[i];
}
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<XMLObject*>& roles=entity->getOrderedChildren();
- for (list<XMLObject*>::const_iterator child=roles.begin(); !role && child!=roles.end(); ++child) {
- role=dynamic_cast<RoleDescriptor*>(*child);
- if (role && !role->isValid())
- role = NULL;
- }
+ const XMLObject* r = find_if(
+ entity->getOrderedChildren(),
+ (ll_dynamic_cast<const RoleDescriptor*>(_1) != nullptr && lambda::bind(isValid, ll_dynamic_cast<const TimeBoundSAMLObject*>(_1), now))
+ );
+ if (r)
+ role = dynamic_cast<const RoleDescriptor*>(r);
}
+
annotateException(e, role, status, rethrow);
}
|| 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);
+ 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());
}
if (status) {
- auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : NULL);
+ auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : nullptr);
if (sc.get() && *sc.get())
e->addProperty("statusCode", sc.get());
if (status->getStatusCode()->getStatusCode()) {
projects / shibboleth / cpp-opensaml.git / blobdiff