Commit graph

14386 commits

Author SHA1 Message Date
Vern Paxson
450f6a97c8 Fix ZAM memory leak as reported in #2634 2023-01-09 12:15:52 +01:00
Vern Paxson
7bf87b6347 fix for crash when specifying an unwriteable file to --profile-scripts (GH-2645) 2023-01-08 18:03:18 -08:00
zeek-bot
e12baf08a7 Update doc submodule [nomail] [skip ci] 2023-01-07 00:21:43 +00:00
zeek-bot
b38c5ab80b Update doc submodule [nomail] [skip ci] 2023-01-06 00:43:33 +00:00
Tim Wojtulewicz
873134f70e Merge remote-tracking branch 'origin/topic/timw/all-the-fuzzing'
* origin/topic/timw/all-the-fuzzing:
  Add error and abort if fuzzer requested is not found
  Add a bunch of new fuzzers and corpus data
2023-01-05 09:53:58 -07:00
Tim Wojtulewicz
bc31e4872c Add error and abort if fuzzer requested is not found 2023-01-05 09:45:45 -07:00
Tim Wojtulewicz
f33fc95bcc Add a bunch of new fuzzers and corpus data 2023-01-05 09:45:44 -07:00
Arne Welzel
3b10d0f6de Merge remote-tracking branch 'origin/topic/awelzel/topic/awelzel/improved-event-disabling'
* origin/topic/awelzel/topic/awelzel/improved-event-disabling:
  EventRegistry/Func: Disable events when all bodies are disabled
2023-01-05 12:13:36 +01:00
Arne Welzel
21cc5f9132 EventRegistry/Func: Disable events when all bodies are disabled
This is just a small optimization on top of what is there.

Add state to Func for tracking if any enabled bodies exist which
allows us to propagate it up to the EventHandler::bool() operator.
In turn, when all bodies of an event's Func have been runtime disabled,
the event itself will not be invoked anymore.

Experiments have shown that this allows runtime toggling of new_event()
without performance impact when disabled. This could enable use-cases
where new_packet() handlers are enabled for a split second once in a
while to either dump or sample raw packet data at runtime.
2023-01-05 12:03:58 +01:00
zeek-bot
c3daaaaeb6 Update doc submodule [nomail] [skip ci] 2023-01-04 00:38:55 +00:00
Tim Wojtulewicz
a778e3158a Merge remote-tracking branch 'origin/topic/timw/sprintf-warnings'
* origin/topic/timw/sprintf-warnings:
  Fix sprintf warnings on macOS
2023-01-03 15:44:54 -07:00
Tim Wojtulewicz
797b7657f5 Fix sprintf warnings on macOS
The most recent compiler update for macOS marked sprintf as
deprecated, so we started getting warnings from all of the places
that use it.
2023-01-03 12:14:41 -07:00
Tim Wojtulewicz
35f5646489 Merge remote-tracking branch 'origin/topic/timw/2521-rename-copying-3rdparty'
* origin/topic/timw/2521-rename-copying-3rdparty:
  Update COPYING to 2023
  Rename COPYING.3rdparty to COPYING-3rdparty
2023-01-03 12:10:29 -07:00
Tim Wojtulewicz
273126a87b Update COPYING to 2023 2023-01-03 12:10:03 -07:00
Tim Wojtulewicz
4f6f46a404 Rename COPYING.3rdparty to COPYING-3rdparty
This keeps GitHub from being confused about this file being part of
the repository's license, and thus not displaying the proper linkage
to our actual COPYING file.
2023-01-03 12:10:03 -07:00
Tim Wojtulewicz
9abe00019d Merge remote-tracking branch 'origin/topic/timw/2578-cirrus-ventura'
* origin/topic/timw/2578-cirrus-ventura:
  CI: avoid doing Windows builds with every push
  CI: drop macOS Big Sur, add macOS Ventura
2023-01-03 12:09:31 -07:00
Tim Wojtulewicz
0f24a58cf2 CI: avoid doing Windows builds with every push 2023-01-03 08:33:00 -07:00
Tim Wojtulewicz
555f705e2d CI: drop macOS Big Sur, add macOS Ventura 2023-01-03 08:33:00 -07:00
Tim Wojtulewicz
83a6faec3c Merge remote-tracking branch 'origin/topic/timw/submodule-updates'
* origin/topic/timw/submodule-updates:
  Update some submodules with recent changes [nomail]
2022-12-16 09:50:18 -07:00
Tim Wojtulewicz
7f19ecae8a Update some submodules with recent changes [nomail] 2022-12-16 08:19:42 -07:00
Tim Wojtulewicz
3573fbb291 Merge remote-tracking branch 'origin/topic/timw/2637-bro-symlink'
* origin/topic/timw/2637-bro-symlink:
  GH-2637: Re-remove the bro symlink wrapper
2022-12-16 08:16:39 -07:00
Tim Wojtulewicz
dd6e4a65ee GH-2637: Re-remove the bro symlink wrapper 2022-12-16 08:16:11 -07:00
Christian Kreibich
92e4c11914 Merge remote-tracking branch 'origin/topic/awelzel/push-to-docker-hub-zeek'
* origin/topic/awelzel/push-to-docker-hub-zeek:
  Docker Hub: Push images to zeek/zeek and zeek/zeek-dev
2022-12-13 21:51:57 -08:00
zeek-bot
ca1138d1f5 Update doc submodule [nomail] [skip ci] 2022-12-14 00:33:05 +00:00
Tim Wojtulewicz
91e14a43fd Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump Spicy and spicy-plugin to latest releases.
2022-12-13 10:25:43 -07:00
Arne Welzel
0206bfe05b Docker Hub: Push images to zeek/zeek and zeek/zeek-dev
We may want to copy some of the current feature and lts releases
over to zeek/zeek by hand, but for now see if pushing works out
for zeek/zeek-dev, mainly.
2022-12-13 16:11:57 +01:00
Arne Welzel
4e75d54d49 scripts/analyzer: Introduce Analyzer::requested_analyzers
In certain deployment scenarios, all analyzers are disabled by default.
However, conditionally/optionally loaded scripts may rely on analyzers
functioning and declare a request for them.

Add a global set set to the Analyzer module where external scripts can record
their requirement/request for a certain analyzer. Analyzers found in this
set are enabled at zeek_init() time.
2022-12-13 14:28:16 +01:00
Arne Welzel
061c066a51 Merge remote-tracking branch 'origin/topic/awelzel/fix-dump-events-test'
* origin/topic/awelzel/fix-dump-events-test:
  Func: Use std::stable_sort() for sorting bodies by priority
  btest/dump-events: Do not skip everywhere and update baselines
2022-12-13 11:51:12 +01:00
Arne Welzel
f1bcb5dad9 Merge remote-tracking branch 'origin/topic/awelzel/topic/awelzel/disable-stream-event-groups-take-two'
* origin/topic/awelzel/topic/awelzel/disable-stream-event-groups-take-two:
  testing/external: Bump cluster testing commit
  logging: Add event_groups to Stream
  zeek.bif: Add has_event_group() / has_module_events()
2022-12-13 11:38:25 +01:00
Christian Kreibich
2a9c0f8d1d Bump cluster testsuite to pull in get-id-value robustness fixes 2022-12-12 19:51:26 -08:00
Benjamin Bannier
b872da7242 Bump Spicy and spicy-plugin to latest releases.
This bumps Spicy to 1.6.0 and spicy-plugin to 1.4.2.
2022-12-12 18:43:16 +01:00
Arne Welzel
93f3c2b612 testing/external: Bump cluster testing commit 2022-12-09 16:59:36 +01:00
Arne Welzel
a0aa00fa81 logging: Add event_groups to Stream
This commit adds an optional event_groups field to the Logging::Stream record
to associated event groups with logging streams.

This can be used to disable all event groups of a logging stream when it is
disabled. It does require making an explicit connection between the
logging stream and the involved groups, however.
2022-12-09 16:59:36 +01:00
Arne Welzel
ba4b8faea2 zeek.bif: Add has_event_group() / has_module_events()
Introduce helpers to determine if a given attribute or module event
group exists given a string.
2022-12-09 16:59:07 +01:00
Arne Welzel
33244ae75f Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Dec22'
* origin/topic/vern/script-opt-maint.Dec22:
  maintenance updates for -O C++
  maintenance updates for -O ZAM
  update test suite to avoid GH-2385 problems, including incorrect typing
2022-12-09 16:08:26 +01:00
Arne Welzel
7ca78ea195 Func: Use std::stable_sort() for sorting bodies by priority
Avoids platform/stdlib dependent sorting of bodies with the same
priority and the same handler. They should be guaranteed to be
executed in load order now.
2022-12-09 15:34:54 +01:00
Arne Welzel
63aaf91bf7 btest/dump-events: Do not skip everywhere and update baselines 2022-12-09 15:34:54 +01:00
Arne Welzel
ded011ef02 Merge remote-tracking branch 'origin/topic/awelzel/dfa-transition-counter'
* origin/topic/awelzel/dfa-transition-counter:
  dfa: Remove transition_counter
2022-12-08 10:28:34 +01:00
zeek-bot
b9684faf5b Update doc submodule [nomail] [skip ci] 2022-12-07 00:36:15 +00:00
Tim Wojtulewicz
93166d0ac4 Remove .lgtm.yml 2022-12-06 11:06:32 -07:00
Arne Welzel
5d64105353 dfa: Remove transition_counter
I believe that's unused since 2011 (8eb241fde7).
2022-12-06 17:27:31 +01:00
Arne Welzel
a349679a4c Merge remote-tracking branch 'origin/topic/awelzel/2629-notice-file-info'
* origin/topic/awelzel/2629-notice-file-info:
  analyzer/files: handle non-analyzer names in describe_file()
  frameworks/notice: Handle fa_file with no or more than a single connection better
2022-12-06 12:23:47 +01:00
Arne Welzel
7bbdce61e8 Merge remote-tracking branch 'origin/topic/awelzel/2547-fix-supress-weird-spelling'
* origin/topic/awelzel/2547-fix-supress-weird-spelling:
  ContentLine: Fix spelling of "suppress", deprecate SupressWeirds()
2022-12-06 12:18:36 +01:00
Arne Welzel
2246a3344d Merge remote-tracking branch 'origin/topic/awelzel/2577-zeekygen-special-case-plugin-dir'
* origin/topic/awelzel/2577-zeekygen-special-case-plugin-dir:
  zeekygen/normalize_script_path: Special case plugin dirnames without _
2022-12-06 12:14:33 +01:00
Arne Welzel
85ce48eb1e analyzer/files: handle non-analyzer names in describe_file()
When a fa_file object is created through the use of Input::add_analysis(),
the fa_file's source is likely not valid representation of an analyzer's
tag and a Files::describe() should not error and instead return an empty
description.

Add a new Analyzer::is_tag() helper that can be used to pre-check `f$source`.
2022-12-06 11:17:30 +01:00
Arne Welzel
1e06c8bfda frameworks/notice: Handle fa_file with no or more than a single connection better
* When a file is transferred over multiple connection, have
  create_file_info() just pick the first one instead of none.

* Do not unconditionally assume cid and cuid as set on a
  Notice::FileInfo object.
2022-12-06 11:17:30 +01:00
Arne Welzel
d9b7da334d Merge branch 'topic/fox-ds/ssh-key-init-events' of github.com:fox-ds/zeek
* 'topic/fox-ds/ssh-key-init-events' of github.com:fox-ds/zeek:
  Added several events for detailed info on the SSH2 key init directions

* Straightened out the zeek:see lines in events.bif to be the same across all events.
2022-12-06 10:04:53 +01:00
Joost Jansen
bcdbca4bb9 Added several events for detailed info on the SSH2 key init directions 2022-12-05 12:35:05 +01:00
Arne Welzel
cd20766ed0 Updating CHANGES and VERSION. 2022-12-05 11:32:53 +01:00
Arne Welzel
56b23fc0b4 Merge branch 'topic/nadavk/krb_pa_ts' of github.com:nadavkluger/zeek
* 'topic/nadavk/krb_pa_ts' of github.com:nadavkluger/zeek:
  Expose PA_ENC_TIMESTAMP to script land
2022-12-05 10:33:53 +01:00