Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

plugins: Reject dynamic plugins matching names of built-in ones

Browse source 
This goes the hard-exit on conflicts route as IMO it provides better
messaging that something is wrong, rather than defaulting to something
the user may not expect.

Fixes #2403
This commit is contained in:
Arne Welzel 2022-09-16 13:43:44 +02:00
parent 5389ad69f8
commit 048f2201fb
7 changed files with 78 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/plugin/Manager.cc
View file

@ -164,6 +164,8 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
dynamic_plugin_map::iterator m = dynamic_plugins.find(util::strtolower(name));
plugin_list* all_plugins = Manager::ActivePluginsInternal();
if ( m == dynamic_plugins.end() )
{
if ( ok_if_not_found )
@ -172,8 +174,6 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
// Check if it's a static built-in plugin; they are always
// active, so just ignore. Not the most efficient way, but
// this should be rare to begin with.
plugin_list* all_plugins = Manager::ActivePluginsInternal();
for ( const auto& p : *all_plugins )
{
if ( p->Name() == name )
@ -195,6 +195,23 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
DBG_LOG(DBG_PLUGINS, "Activating plugin %s", name.c_str());
// If there's a plugin with the same name already, report an error and let
// the user do the conflict resolution.
auto lower_name = util::strtolower(name);
for ( const auto& p : *all_plugins )
{
if ( util::strtolower(p->Name()) == lower_name )
{
auto v = p->Version();
auto error = util::fmt(
"dynamic plugin %s from directory %s conflicts with %s plugin %s (%d.%d.%d)",
name.c_str(), dir.c_str(), p->DynamicPlugin() ? "dynamic" : "built-in",
p->Name().c_str(), v.major, v.minor, v.patch);
errors->push_back(error);
return false;
}
}
// Load shared libraries.
string dypattern = dir + "/lib/*." + HOST_ARCHITECTURE + DYNAMIC_PLUGIN_SUFFIX;