Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-14 09:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

PluginManager: Do not load built-in plugins via dlopen/dlsym

Browse Source 
fixes #351
This commit is contained in:
Dennis Klein 2021-04-28 01:27:57 +02:00
parent b328fb01af
commit 3d53f901d2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fairmq/PluginManager.cxx
View File

@ -200,7 +200,19 @@ auto fair::mq::PluginManager::LoadPluginStatic(const string& pluginName) -> void
// Load symbol // Load symbol
if (fPluginFactories.find(pluginName) == fPluginFactories.end()) { if (fPluginFactories.find(pluginName) == fPluginFactories.end()) {
try { try {
LoadSymbols(pluginName, dll::program_location()); if ("control" == pluginName) {
try {
fPluginProgOptions.insert({pluginName, plugins::ControlPluginProgramOptions().value()});
}
catch (const boost::bad_optional_access& e) { /* just ignore, if no prog options are declared */ }
} else if ("config" == pluginName) {
try {
fPluginProgOptions.insert({pluginName, plugins::ConfigPluginProgramOptions().value()});
}
catch (const boost::bad_optional_access& e) { /* just ignore, if no prog options are declared */ }
} else {
LoadSymbols(pluginName, dll::program_location());
}
fPluginOrder.push_back(pluginName); fPluginOrder.push_back(pluginName);
} catch (boost::system::system_error& e) { } catch (boost::system::system_error& e) {
throw PluginLoadError(ToString("An error occurred while loading static plugin ", pluginName, ": ", e.what())); throw PluginLoadError(ToString("An error occurred while loading static plugin ", pluginName, ": ", e.what()));
@ -211,7 +223,13 @@ auto fair::mq::PluginManager::LoadPluginStatic(const string& pluginName) -> void
auto fair::mq::PluginManager::InstantiatePlugin(const string& pluginName) -> void auto fair::mq::PluginManager::InstantiatePlugin(const string& pluginName) -> void
{ {
if (fPlugins.find(pluginName) == fPlugins.end()) { if (fPlugins.find(pluginName) == fPlugins.end()) {
fPlugins[pluginName] = fPluginFactories[pluginName](*fPluginServices); if ("control" == pluginName) {
fPlugins[pluginName] = plugins::Make_control_Plugin(fPluginServices.get());
} else if ("config" == pluginName) {
fPlugins[pluginName] = plugins::Make_config_Plugin(fPluginServices.get());
} else {
fPlugins[pluginName] = fPluginFactories[pluginName](*fPluginServices);
}
} }
} }