X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=12e60e1d706811ffbfa7204b3cd5f247b4eccfb9;hb=840b05eda26529a8c06790960bbb227162523309;hp=b36e9b0a2973c7bad729bb80ab7ec55c205ec405;hpb=01832f09c095512baad6210854ad3a3c6a8d9622;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp index b36e9b0..12e60e1 100644 --- a/saml/SAMLConfig.cpp +++ b/saml/SAMLConfig.cpp @@ -1,5 +1,6 @@ + /* - * Copyright 2001-2006 Internet2 + * 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. @@ -17,38 +18,77 @@ /** * SAMLConfig.cpp * - * Library configuration + * Library configuration. */ -#define SAML_DECLARE_VALIDATORS - #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 "binding/MessageDecoder.h" +#include "binding/MessageEncoder.h" +#include "binding/SAMLArtifact.h" +#include "binding/SecurityPolicyRule.h" #include "saml1/core/Assertions.h" -#include "util/XMLConstants.h" +#include "saml1/core/Protocols.h" +#include "saml2/core/Protocols.h" +#include "saml2/metadata/Metadata.h" +#include "saml2/metadata/MetadataFilter.h" +#include "saml2/metadata/MetadataProvider.h" +#include "util/SAMLConstants.h" -#include +#include #include +#include +#include #include +#include + +#include +#include +#include -using namespace opensaml::saml1; using namespace opensaml; +using namespace xmlsignature; +using namespace xmltooling::logging; using namespace xmltooling; -using namespace log4cpp; +using namespace std; -#define REGISTER_ELEMENT(namespaceURI,cname) \ - q=QName(namespaceURI,cname::LOCAL_NAME); \ - XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \ - Validator::registerValidator(q,new cname##SchemaValidator()) - -#define REGISTER_TYPE(namespaceURI,cname) \ - q=QName(namespaceURI,cname::TYPE_NAME); \ - XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \ - Validator::registerValidator(q,new cname##SchemaValidator()) +// Expose entry points when used as an extension library + +extern "C" int SAML_API xmltooling_extension_init(void*) +{ + if (SAMLConfig::getConfig().init(false)) + return 0; + return -1; +} +extern "C" void SAML_API xmltooling_extension_term() +{ + SAMLConfig::getConfig().term(false); +} -//DECL_EXCEPTION_FACTORY(XMLParserException,xmltooling); +DECL_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataException,opensaml::saml2md); +DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); +DECL_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml); namespace opensaml { SAMLInternalConfig g_config; @@ -64,7 +104,26 @@ SAMLInternalConfig& SAMLInternalConfig::getInternalConfig() return g_config; } -bool SAMLInternalConfig::init() +SAMLConfig::SAMLConfig() : m_artifactMap(NULL) +{ +} + +SAMLConfig::~SAMLConfig() +{ +} + +ArtifactMap* SAMLConfig::getArtifactMap() const +{ + return m_artifactMap; +} + +void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap) +{ + delete m_artifactMap; + m_artifactMap = artifactMap; +} + +bool SAMLInternalConfig::init(bool initXMLTooling) { #ifdef _DEBUG xmltooling::NDC ndc("init"); @@ -72,23 +131,192 @@ bool SAMLInternalConfig::init() Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig"); log.debug("library initialization started"); - XMLToolingConfig::getConfig().init(); - log.debug("XMLTooling library initialized"); + if (initXMLTooling) + XMLToolingConfig::getConfig().init(); + XMLToolingConfig::getConfig().getPathResolver()->setDefaultPackageName("opensaml"); + + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataException,opensaml::saml2md); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml); - QName q; - REGISTER_ELEMENT(XMLConstants::SAML1_NS,AssertionIDReference); - REGISTER_ELEMENT(XMLConstants::SAML1_NS,Audience); - REGISTER_ELEMENT(XMLConstants::SAML1_NS,ConfirmationMethod); + saml1::registerAssertionClasses(); + saml1p::registerProtocolClasses(); + saml2::registerAssertionClasses(); + saml2p::registerProtocolClasses(); + saml2md::registerMetadataClasses(); + saml2md::registerMetadataProviders(); + saml2md::registerMetadataFilters(); + registerSAMLArtifacts(); + registerMessageEncoders(); + registerMessageDecoders(); + registerSecurityPolicyRules(); - log.info("library initialization complete"); + log.info("%s library initialization complete", PACKAGE_STRING); return true; } -void SAMLInternalConfig::term() +void SAMLInternalConfig::term(bool termXMLTooling) { #ifdef _DEBUG xmltooling::NDC ndc("term"); #endif - XMLToolingConfig::getConfig().term(); - Category::getInstance(SAML_LOGCAT".SAMLConfig").info("library shutdown complete"); + Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig"); + + MessageDecoderManager.deregisterFactories(); + MessageEncoderManager.deregisterFactories(); + SecurityPolicyRuleManager.deregisterFactories(); + SAMLArtifactManager.deregisterFactories(); + MetadataFilterManager.deregisterFactories(); + MetadataProviderManager.deregisterFactories(); + + delete m_artifactMap; + m_artifactMap = NULL; + + if (termXMLTooling) + XMLToolingConfig::getConfig().term(); + + log.info("%s library shutdown complete", PACKAGE_STRING); +} + +void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len) +{ + try { + if (XSECPlatformUtils::g_cryptoProvider->getRandom(reinterpret_cast(buf),len) hold(new unsigned char[len]); + generateRandomBytes(hold.get(),len); + for (unsigned int i=0; i& 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; + } + } + annotateException(e, role, status, rethrow); +} + +void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* role, const Status* status, bool rethrow) +{ + if (role) { + 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()); + } + break; + } + } + + auto_ptr_char eurl(role->getErrorURL()); + if (eurl.get()) { + e->addProperty("errorURL",eurl.get()); + } + } + + if (status) { + auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : NULL); + 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(); }