Commit graph

16055 commits

Author SHA1 Message Date
Tim Wojtulewicz
58f4ff91d8 Fixes to support the Npcap library on Windows
- Ignore conan libpcap if PCAP_ROOT_DIR is passed
- Update the cmake submodule to pick up changes for finding the right
  paths to npcap
- Add lazy-loading of npcap so the library path gets set correctly
  at startup
2023-01-11 11:42:58 -07:00
Johanna Amann
7c54d1aa1c Merge remote-tracking branch 'origin/topic/vern/gh-2645'
* origin/topic/vern/gh-2645:
  fix for crash when specifying an unwriteable file to --profile-scripts (GH-2645)
2023-01-11 09:00:47 +00:00
Christian Kreibich
7bf2d1f6e2 Update doc submodule [nomail] [skip ci] 2023-01-10 19:01:21 -08:00
Christian Kreibich
12885c7475 Fix a docstring typo 2023-01-10 18:49:19 -08:00
Christian Kreibich
1697bf13b1 CI: remove Fedora 35, now EOL 2023-01-10 17:27:23 -08:00
Christian Kreibich
e5e09cffe9 CI: avoid deprecated ::set-output use
This pattern is deprecated in favor of environment files and throwing warnings
in the CI runs. Details below.

https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
2023-01-10 17:18:52 -08:00
Christian Kreibich
b5777aa54e CI: move action/checkout use to v3
Being less specific here automatically pulls in their point releases.
2023-01-10 17:04:29 -08:00
zeek-bot
f5305ade7f Update doc submodule [nomail] [skip ci] 2023-01-11 00:35:58 +00:00
Vern Paxson
a172617250 fix for crashes when record definitions repeat a field name 2023-01-10 13:56:47 -08:00
Dominik Charousset
f7806f640d Update Broker submodule 2023-01-10 17:29:18 +01:00
Arne Welzel
4396124d89 Merge remote-tracking branch 'origin/topic/christian/file-event-docstrings'
* origin/topic/christian/file-event-docstrings:
  Expand docstrings of file_new and file_over_new_connection events
2023-01-10 10:31:17 +01:00
Arne Welzel
2d852209b0 Merge remote-tracking branch 'origin/topic/awelzel/analyzer-log'
* origin/topic/awelzel/analyzer-log:
  btest/net-control: Use different expiration times for rules
  analyzer: Add analyzer.log for logging violations/confirmations
2023-01-10 10:22:58 +01:00
Arne Welzel
a004bdf5d9 Merge remote-tracking branch 'origin/topic/awelzel/2647-intel-seen-file-names'
* origin/topic/awelzel/2647-intel-seen-file-names:
  intel/seen/file-names: Use file_over_new_connection()
2023-01-10 10:12:04 +01:00
Arne Welzel
ebf1a199c2 Merge branch 'topic/awelzel/analyzer-requested-analyzers'
* topic/awelzel/analyzer-requested-analyzers:
  scripts/analyzer: Introduce Analyzer::requested_analyzers
2023-01-10 10:11:37 +01:00
Arne Welzel
6d19c49efe intel/seen/file-names: Use file_over_new_connection()
The seen/file-names script relies on f$info$filename to be populated.
For HTTP and other network protocols, however, this field is only
populated during file_over_new_connection() that's running after
file_new().

Use the file_new() event only for files without connections and
file_over_new_connection() implies that f$conns is populated, anyway.

Special case SMB to avoid finding files twice, because there's a
custom implementation in seen/smb-filenames.zeek.

Fixes #2647
2023-01-10 10:10:28 +01:00
Christian Kreibich
9cfa36bcf9 Expand docstrings of file_new and file_over_new_connection events 2023-01-09 19:06:27 -08:00
Arne Welzel
56833fcfd9 btest/net-control: Use different expiration times for rules
There's some non-determinism here: Force the expiration of the
shunt_flow rules first.
2023-01-09 18:11:55 +01:00
Arne Welzel
17d0ade26a analyzer: Add analyzer.log for logging violations/confirmations
By default this only logs all the violations, regardless of the
confirmation state (for which there's still dpd.log). It includes
packet, protocol and file analyzers.

This uses options, change handlers and event groups for toggling
the functionality at runtime.

Closes #2031
2023-01-09 18:11:49 +01:00
Arne Welzel
51376191f7 testing/btest: Add ZAM basic test
While there's a btest environment for ZAM, it's currently not run by
default. Add a single zam/basic.test so that we catch memory leaks or
dead-on-arrival cases with the current CI setup.
2023-01-09 12:30:26 +01:00
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