-
-/*
- * 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.
*/
/**
* SAMLConfig.cpp
*
- * Library configuration
+ * Library configuration.
*/
#include "internal.h"
+
+#if defined(XMLTOOLING_LOG4SHIB)
+# ifndef OPENSAML_LOG4SHIB
+# error "Logging library mismatch (XMLTooling is using log4shib)."
+# endif
+#elif defined(XMLTOOLING_LOG4CPP)
+# ifndef OPENSAML_LOG4CPP
+# error "Logging library mismatch (XMLTooling is using log4cpp)."
+# endif
+#else
+# error "No supported logging library."
+#endif
+
#include "exceptions.h"
#include "SAMLConfig.h"
#include "binding/ArtifactMap.h"
#include "saml2/metadata/MetadataProvider.h"
#include "util/SAMLConstants.h"
+#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/security/SecurityHelper.h>
#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 <log4cpp/Category.hh>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
+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(nullptr)
+{
+}
+
+SAMLConfig::~SAMLConfig()
+{
+ delete m_artifactMap;
+}
+
+ArtifactMap* SAMLConfig::getArtifactMap() const
+{
+ return m_artifactMap;
+}
+
void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap)
{
delete m_artifactMap;
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();
- log.debug("XMLTooling library initialized");
+ if (initXMLTooling && !XMLToolingConfig::getConfig().init()) {
+ return false;
}
+ XMLToolingConfig::getConfig().getPathResolver()->setDefaultPackageName("opensaml");
+
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataException,opensaml::saml2md);
registerMessageDecoders();
registerSecurityPolicyRules();
- log.info("library initialization complete");
+ 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) {
+ if (termXMLTooling)
XMLToolingConfig::getConfig().term();
- log.debug("XMLTooling library shut down");
- }
- log.info("library shutdown complete");
+
+ 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];
}
string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
{
- static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- auto_ptr<XSECCryptoHash> hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1());
- if (hasher.get()) {
- unsigned char buf[21];
- hasher->hash(reinterpret_cast<unsigned char*>(const_cast<char*>(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;
- }
- }
- throw XMLSecurityException("Unable to generate SHA-1 hash.");
+ return SecurityHelper::doHash("SHA1", s, strlen(s), toHex);
+}
+
+SignableObject::SignableObject()
+{
+}
+
+SignableObject::~SignableObject()
+{
+}
+
+RootObject::RootObject()
+{
+}
+
+RootObject::~RootObject()
+{
+}
+
+Assertion::Assertion()
+{
}
+Assertion::~Assertion()
+{
+}
+
+using namespace saml2p;
using namespace saml2md;
-void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, bool rethrow)
+void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, const Status* status, bool rethrow)
{
+ time_t now = time(nullptr);
+ const RoleDescriptor* role = nullptr;
+ static bool (TimeBoundSAMLObject::* isValid)(time_t) const = &TimeBoundSAMLObject::isValid;
+
if (entity) {
- auto_ptr_char id(entity->getEntityID());
- e->addProperty("entityID",id.get());
- const list<XMLObject*>& roles=entity->getOrderedChildren();
- for (list<XMLObject*>::const_iterator child=roles.begin(); child!=roles.end(); ++child) {
- const RoleDescriptor* role=dynamic_cast<RoleDescriptor*>(*child);
- if (role && role->isValid()) {
- const vector<ContactPerson*>& contacts=role->getContactPersons();
- for (vector<ContactPerson*>::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<EmailAddress*>& emails=const_cast<const ContactPerson*>(*c)->getEmailAddresss();
- if (!emails.empty()) {
- auto_ptr_char email(emails.front()->getAddress());
- if (email.get())
- e->addProperty("contactEmail",email.get());
- }
- break;
- }
- }
- if (e->getProperty("contactName") || e->getProperty("contactEmail")) {
- auto_ptr_char eurl(role->getErrorURL());
- if (eurl.get()) {
- e->addProperty("errorURL",eurl.get());
- }
- }
- break;
- }
- }
+ 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);
}
-
- if (rethrow)
- e->raise();
+
+ annotateException(e, role, status, rethrow);
}
-void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* role, bool rethrow)
+void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* role, const Status* status, bool rethrow)
{
if (role) {
auto_ptr_char id(dynamic_cast<EntityDescriptor*>(role->getParent())->getEntityID());
|| 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() : nullptr);
+ if (sc.get() && *sc.get())
+ e->addProperty("statusCode", sc.get());
+ if (status->getStatusCode()->getStatusCode()) {
+ auto_ptr_char sc2(status->getStatusCode()->getStatusCode()->getValue());
+ if (sc2.get() && *sc.get())
+ e->addProperty("statusCode2", sc2.get());
+ }
+ if (status->getStatusMessage()) {
+ auto_ptr_char msg(status->getStatusMessage()->getMessage());
+ if (msg.get() && *msg.get())
+ e->addProperty("statusMessage", msg.get());
+ }
+ }
+
if (rethrow)
e->raise();
}
projects / shibboleth / cpp-opensaml.git / blobdiff