Commit graph

14221 commits

Author SHA1 Message Date
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
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
Christian Kreibich
01930b0b07 Update btest submodule [nomail] [skip ci] 2022-12-04 18:45:00 -08:00
Christian Kreibich
dbd5f4e1b7 Merge remote-tracking branch 'origin/topic/awelzel/2628-is-used-multiple'
* origin/topic/awelzel/2628-is-used-multiple:
  ID: Add AddAttr() helper
  Attr: Duplicated &is_used is allowed
2022-12-04 18:37:11 -08:00
Vern Paxson
52775bea89 maintenance updates for -O C++ 2022-12-04 17:59:14 -08:00
Vern Paxson
ab7cccf9b6 maintenance updates for -O ZAM 2022-12-04 17:58:33 -08:00
Vern Paxson
66c5bdbeac update test suite to avoid GH-2385 problems, including incorrect typing 2022-12-04 17:56:30 -08:00
Christian Kreibich
3c33728a2a Merge branch 'topic/awelzel/trailing-commas'
* topic/awelzel/trailing-commas:
  parse.y: Allow trailing commas for table, set, vector and record construction
2022-12-02 18:39:22 -08:00
Arne Welzel
da5fdb2072 ID: Add AddAttr() helper
This is just a follow-up as code cleanup, but not required
to be backported to 5.1.
2022-12-02 18:06:39 +01:00
Arne Welzel
ef920ef3f5 Attr: Duplicated &is_used is allowed
When using the same function for eval conditions in signatures, we
previously attempted to add &is_used multiple times to the function
triggering an ambiguous attribute error.

Turns out there's already a list of attributes that are accepted
to be used multiple times, so just add ATTR_IS_USED there.

Fixes #2628
2022-12-02 17:15:05 +01:00
nadavkluger
433b535e10 Expose PA_ENC_TIMESTAMP to script land 2022-12-02 15:43:19 +02:00
Arne Welzel
76ba9d4698 ContentLine: Fix spelling of "suppress", deprecate SupressWeirds()
Closes #2547
2022-12-02 12:40:47 +01:00
Johanna Amann
dbbb6cd6f0 Merge remote-tracking branch 'origin/topic/awelzel/alpine-317-musl-fts-dev'
* origin/topic/awelzel/alpine-317-musl-fts-dev:
  ci/alpine: Use musl-fts-dev rather than fts-dev
2022-12-01 13:30:39 +00:00
Arne Welzel
203a309612 parse.y: Allow trailing commas for table, set, vector and record construction
Python, Ruby, Javascript, Go, ..., allow use of trailing commas and is even
recommended in some style-guides as it keeps diffs smaller. The black formatter
for Python even goes as far to take a trailing comma as an indication to
format a list one-item on a line.

It has been a bit unusual to not be able to put trailing commas in Zeek
scripts, so this change allows for it.

It explicitly prevents trailing commas in list expressions on the left
hand side. Concretely, this disallows trailing commas in the key list
expression during table initializations.

It probably allows for commas in more places that I haven't fully grasped.
Maybe we should tighten those down again if we find them surprising.
2022-12-01 12:05:29 +01:00
Arne Welzel
c61fdc7866 ci/alpine: Use musl-fts-dev rather than fts-dev
With the release of alpine 3.17 (2022-11-22), the fts-dev package
was renamed to musl-fts-dev. Change it accordingly.

This is currently breaking CI in a fork of zeek/zeek. Suspect some
caching prevents it from breaking here currently.

Alpine 3.16 is still supported till 2024-05-23, but we're essentially
not doing CI testing for it anymore. Appears to be in line with the
comment in .cirrus.yml
2022-12-01 09:17:09 +01:00
zeek-bot
017525af71 Update doc submodule [nomail] [skip ci] 2022-12-01 00:35:52 +00:00
Christian Kreibich
1c381b5531 Merge branch 'topic/christian/gh-846-tcp-duration-docs'
* topic/christian/gh-846-tcp-duration-docs:
  Expand Conn::Info$duration comment to clarify TCP end-of-connection handling
2022-11-30 09:42:18 -08:00