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

Merge remote-tracking branch 'origin/topic/seth/small-builtin-plugin-fixes'

Browse source 
* origin/topic/seth/small-builtin-plugin-fixes:
  Fix tests
  Removed a non-functional builtin plugin preload loading mechanism
  Load the builtin-plugin preload files and fix the dev path.
This commit is contained in:
Tim Wojtulewicz 2021-06-30 14:10:58 -07:00
commit 3c0bb8f1dd
8 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
4.1.0-dev.837 | 2021-06-30 14:10:58 -0700
* Fix tests (Seth Hall, Corelight)
* Removed a non-functional builtin plugin preload loading mechanism (Seth Hall, Corelight)
* Load the builtin-plugin preload files and fix the dev path. (Seth Hall, Corelight)
4.1.0-dev.833 | 2021-06-30 08:50:39 -0700 4.1.0-dev.833 | 2021-06-30 08:50:39 -0700
* GH-1500: Mark BasicThread::Done to be ignored by ThreadSanitizer (Tim Wojtulewicz, Corelight) * GH-1500: Mark BasicThread::Done to be ignored by ThreadSanitizer (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.833 4.1.0-dev.837

9
src/plugin/Manager.cc
View file

@ -275,15 +275,6 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
// First load {scripts}/__preload__.zeek automatically. // First load {scripts}/__preload__.zeek automatically.
init = dir + "scripts/__preload__.zeek"; init = dir + "scripts/__preload__.zeek";
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
}
// First load {scripts}/__preload__.zeek automatically.
init = dir + "builtin-plugins/__preload__.zeek";
if ( util::is_file(init) ) if ( util::is_file(init) )
{ {
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str()); DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());

1
src/zeek-setup.cc
View file

@ -534,6 +534,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
if ( ! options.bare_mode ) if ( ! options.bare_mode )
add_input_file("base/init-default.zeek"); add_input_file("base/init-default.zeek");
add_input_file("builtin-plugins/__preload__.zeek");
add_input_file("builtin-plugins/__load__.zeek"); add_input_file("builtin-plugins/__load__.zeek");
plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path()); plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());

1
testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
View file

@ -230,6 +230,7 @@ scripts/base/init-frameworks-and-bifs.zeek
build/scripts/base/bif/plugins/Zeek_AsciiWriter.ascii.bif.zeek build/scripts/base/bif/plugins/Zeek_AsciiWriter.ascii.bif.zeek
build/scripts/base/bif/plugins/Zeek_NoneWriter.none.bif.zeek build/scripts/base/bif/plugins/Zeek_NoneWriter.none.bif.zeek
build/scripts/base/bif/plugins/Zeek_SQLiteWriter.sqlite.bif.zeek build/scripts/base/bif/plugins/Zeek_SQLiteWriter.sqlite.bif.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/__load__.zeek build/scripts/builtin-plugins/__load__.zeek
scripts/policy/misc/loaded-scripts.zeek scripts/policy/misc/loaded-scripts.zeek
scripts/base/utils/paths.zeek scripts/base/utils/paths.zeek

1
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -427,6 +427,7 @@ scripts/base/init-default.zeek
scripts/base/misc/find-checksum-offloading.zeek scripts/base/misc/find-checksum-offloading.zeek
scripts/base/misc/find-filtered-trace.zeek scripts/base/misc/find-filtered-trace.zeek
scripts/base/misc/version.zeek scripts/base/misc/version.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/__load__.zeek build/scripts/builtin-plugins/__load__.zeek
scripts/policy/misc/loaded-scripts.zeek scripts/policy/misc/loaded-scripts.zeek
#close XXXX-XX-XX-XX-XX-XX #close XXXX-XX-XX-XX-XX-XX

3
testing/btest/Baseline/plugins.hooks/output
View file

@ -1013,6 +1013,7 @@
0.000000 MetaHookPost LoadFile(0, base<...>/xmpp, <...>/xmpp) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/xmpp, <...>/xmpp) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/zeek.bif, <...>/zeek.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/zeek.bif, <...>/zeek.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, builtin-plugins/__load__.zeek, <...>/__load__.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, builtin-plugins/__load__.zeek, <...>/__load__.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, builtin-plugins/__preload__.zeek, <...>/__preload__.zeek) -> -1
0.000000 MetaHookPost LoadFile(1, ./archive, <...>/archive.sig) -> -1 0.000000 MetaHookPost LoadFile(1, ./archive, <...>/archive.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./audio, <...>/audio.sig) -> -1 0.000000 MetaHookPost LoadFile(1, ./audio, <...>/audio.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./dpd.sig, <...>/dpd.sig) -> -1 0.000000 MetaHookPost LoadFile(1, ./dpd.sig, <...>/dpd.sig) -> -1
@ -2044,6 +2045,7 @@
0.000000 MetaHookPre LoadFile(0, base<...>/xmpp, <...>/xmpp) 0.000000 MetaHookPre LoadFile(0, base<...>/xmpp, <...>/xmpp)
0.000000 MetaHookPre LoadFile(0, base<...>/zeek.bif, <...>/zeek.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/zeek.bif, <...>/zeek.bif.zeek)
0.000000 MetaHookPre LoadFile(0, builtin-plugins/__load__.zeek, <...>/__load__.zeek) 0.000000 MetaHookPre LoadFile(0, builtin-plugins/__load__.zeek, <...>/__load__.zeek)
0.000000 MetaHookPre LoadFile(0, builtin-plugins/__preload__.zeek, <...>/__preload__.zeek)
0.000000 MetaHookPre LoadFile(1, ./archive, <...>/archive.sig) 0.000000 MetaHookPre LoadFile(1, ./archive, <...>/archive.sig)
0.000000 MetaHookPre LoadFile(1, ./audio, <...>/audio.sig) 0.000000 MetaHookPre LoadFile(1, ./audio, <...>/audio.sig)
0.000000 MetaHookPre LoadFile(1, ./dpd.sig, <...>/dpd.sig) 0.000000 MetaHookPre LoadFile(1, ./dpd.sig, <...>/dpd.sig)
@ -3086,6 +3088,7 @@
0.000000 | HookLoadFile base<...>/xmpp <...>/xmpp 0.000000 | HookLoadFile base<...>/xmpp <...>/xmpp
0.000000 | HookLoadFile base<...>/zeek.bif <...>/zeek.bif.zeek 0.000000 | HookLoadFile base<...>/zeek.bif <...>/zeek.bif.zeek
0.000000 | HookLoadFile builtin-plugins/__load__.zeek <...>/__load__.zeek 0.000000 | HookLoadFile builtin-plugins/__load__.zeek <...>/__load__.zeek
0.000000 | HookLoadFile builtin-plugins/__preload__.zeek <...>/__preload__.zeek
0.000000 | HookLogInit packet_filter 1/1 {ts (time), node (string), filter (string), init (bool), success (bool)} 0.000000 | HookLogInit packet_filter 1/1 {ts (time), node (string), filter (string), init (bool), success (bool)}
0.000000 | HookLogWrite packet_filter [ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T] 0.000000 | HookLogWrite packet_filter [ts=XXXXXXXXXX.XXXXXX, node=zeek, filter=ip or not ip, init=T, success=T]
0.000000 | HookQueueEvent NetControl::init() 0.000000 | HookQueueEvent NetControl::init()

2
zeek-path-dev.in
View file

@ -10,4 +10,4 @@
# ZEEKPATH=`./zeek-path-dev` ./src/zeek # ZEEKPATH=`./zeek-path-dev` ./src/zeek
# #
echo .:${CMAKE_SOURCE_DIR}/scripts:${CMAKE_SOURCE_DIR}/scripts/policy:${CMAKE_SOURCE_DIR}/scripts/site:${CMAKE_BINARY_DIR}/scripts echo .:${CMAKE_SOURCE_DIR}/scripts:${CMAKE_SOURCE_DIR}/scripts/policy:${CMAKE_SOURCE_DIR}/scripts/site:${CMAKE_BINARY_DIR}/scripts:${CMAKE_BINARY_DIR}/scripts/builtin-plugins