Commit graph

15302 commits

Author SHA1 Message Date
Tim Wojtulewicz
7a7864f892 Update CHANGES, VERSION, and NEWS for 6.0.9 release 2024-11-19 11:41:12 -07:00
Benjamin Bannier
a5103a1da2 Merge remote-tracking branch 'origin/topic/bbannier/ci-opensuse-leap-ps-dep'
(cherry picked from commit a27066e3fc)
2024-11-14 16:07:20 -07:00
Tim Wojtulewicz
b6a3568781 CI: Remove EOL (and broken) centos-stream-8 task 2024-11-14 15:52:49 -07:00
Benjamin Bannier
8d99599a94 Merge remote-tracking branch 'origin/topic/bbannier/spicy-cookie-nullptr-deref'
(cherry picked from commit 2e8d6e86e7)
2024-11-14 14:45:18 -07:00
Arne Welzel
e04682434f Merge branch 'modbus-fixes' of https://github.com/zambo99/zeek
* 'modbus-fixes' of https://github.com/zambo99/zeek:
  Prevent non-Modbus on port 502 to be reported as Modbus

(cherry picked from commit 4763282f36)
2024-11-14 13:51:48 -07:00
Tim Wojtulewicz
cf872c52a9 Minor clang-format fix 2024-11-14 13:50:44 -07:00
Christian Kreibich
fda740bc2c Merge branch 'topic/awelzel/3957-raw-reader-spinning'
* topic/awelzel/3957-raw-reader-spinning:
  input/Raw: Rework GetLine()

(cherry picked from commit 2a23e9fc19)
2024-11-14 13:50:10 -07:00
Christian Kreibich
553040edfb Merge remote-tracking branch 'origin/topic/bbannier/fix-docs-ci-again'
* origin/topic/bbannier/fix-docs-ci-again:
  Fix installation of Python packages in generate docs CI job again

(cherry picked from commit c28442a9a1)
2024-10-18 17:17:40 -07:00
Christian Kreibich
32214ef983 Update CHANGES, VERSION, and NEWS for 6.0.8 release 2024-10-04 14:50:46 -07:00
Christian Kreibich
49acb2a030 Updating CHANGES and VERSION. 2024-10-04 14:50:11 -07:00
Christian Kreibich
353c467fb4 Merge remote-tracking branch 'security/topic/awelzel/215-pop3-mail-null-deref'
* security/topic/awelzel/215-pop3-mail-null-deref:
  POP3: Rework unbounded pending command fix

(cherry picked from commit 7fea32c6edc5d4d14646366f87c9208c8c9cf555)
2024-10-04 10:49:29 -07:00
Tim Wojtulewicz
6dcb3291d2 Update CHANGES, VERSION, and NEWS for 6.0.7 release 2024-09-23 21:29:46 -07:00
Johanna Amann
f4cace7920 Merge remote-tracking branch 'origin/topic/timw/remove-negative-timestamp-test'
* origin/topic/timw/remove-negative-timestamp-test:
  Remove core.negative-time btest

(cherry picked from commit 899f7297d7)
2024-09-23 20:44:12 -07:00
Arne Welzel
6c0c623b9f btest/plugins/hooks: Run in bare mode
Motivation is basically the same as in 88bb527026.
For plugin.hooks, one example is that adding a new option in the default script
changes the baseline due registration of change handlers. Also, the connection
record is printed in various places, resulting in churn when the default
scripts change.

(cherry picked from commit 07ac6fa074)
2024-09-23 20:29:16 -07:00
Arne Welzel
e1cf38101b btest/dump-events: Run in bare mode, load conn and smtp scripts only
The dump-events baseline changes are pure noise and have spurred confusion
for internal and external contributors. For example, adding new
analyzers have perturbed orderings of sets holding analyzer tags.

Running in non-bare mode, the baselines change almost whenever any of the
record types attached to connections change in the default scripts. This
causes continuous and seemingly little useful updates to the baselines.

This change switches the test to run in bare mode and explicitly loads
just base/protocols/conn and base/protocols/smtp. The primary intention
of the test should be testing the functionality of the misc/dump-events
script, not the raised events of all loaded default scripts (for that the
used PCAP is too narrow).

Protocol specific scripts that do want to leverage misc/dump-events for
baseline creation of their or their analyzer's events can add additional
specific tests with suitable PCAP files.

(cherry picked from commit 88bb527026)
2024-09-23 20:28:26 -07:00
Tim Wojtulewicz
f091d3fb89 Force flushing ccache to try to fix plugins.hooks btest 2024-09-23 15:04:28 -07:00
Tim Wojtulewicz
6c8ea3e36a Update docs submodule [nomail] [skip ci] 2024-09-23 13:01:13 -07:00
Tim Wojtulewicz
9503d3298d Merge remote-tracking branch 'origin/topic/awelzel/3936-pop3-and-redis'
* origin/topic/awelzel/3936-pop3-and-redis:
  pop3: Remove unused headers
  pop3: Prevent unbounded state growth
  btest/pop3: Add somewhat more elaborate testing

(cherry picked from commit 702fb031a4)
2024-09-23 12:45:36 -07:00
Tim Wojtulewicz
2ec7e59771 Updating CHANGES and VERSION. 2024-09-03 14:55:46 -07:00
Tim Wojtulewicz
de4c0b19ef CI: Fix centos-7 Dockerfile to replace obsolete yum repos 2024-09-03 14:46:02 -07:00
Tim Wojtulewicz
c08d65aeed Update CHANGES, VERSION, and NEWS for 6.0.6 2024-09-03 12:50:14 -07:00
Tim Wojtulewicz
dd6aff1145 Update docs submodule [nomail] [skip ci] 2024-09-03 12:50:14 -07:00
Tim Wojtulewicz
6003f987da Updating CHANGES and VERSION. 2024-08-30 14:46:44 -07:00
Arne Welzel
75ef9ac233 Merge branch 'fix-http-password-capture' of https://github.com/p-l-/zeek
* 'fix-http-password-capture' of https://github.com/p-l-/zeek:
  http: fix password capture when enabled

(cherry picked from commit c27e18631c)
2024-08-30 14:45:25 -07:00
Arne Welzel
36e504a1e4 Merge remote-tracking branch 'origin/topic/awelzel/tcp-reassembler-undelivered-data-match-bool-bool-bool-confusion'
* origin/topic/awelzel/tcp-reassembler-undelivered-data-match-bool-bool-bool-confusion:
  TCP_Reassembler: Fix IsOrig() position in Match() call

(cherry picked from commit 4a4cbf2576)
2024-08-30 14:44:52 -07:00
Arne Welzel
eb8f76cd52 Merge remote-tracking branch 'origin/topic/timw/use-more-memory-for-freebsd-builds'
* origin/topic/timw/use-more-memory-for-freebsd-builds:
  CI: Use 16GB of memory for FreeBSD builds

(cherry picked from commit 9d9cc51e9d)
2024-08-30 14:41:42 -07:00
Tim Wojtulewicz
5fef9d421d Update CHANGES, VERSION, and NEWS for 6.0.5 2024-08-01 11:18:44 -07:00
Tim Wojtulewicz
6930e80800 Merge remote-tracking branch 'origin/topic/johanna/update-the-ct-list-and-the-ca-list-again'
* origin/topic/johanna/update-the-ct-list-and-the-ca-list-again:
  Update Mozilla CA list and CT list

(cherry picked from commit cb88f6316c)
2024-08-01 11:18:14 -07:00
Tim Wojtulewicz
301d852ddd Updating CHANGES and VERSION. 2024-08-01 10:50:17 -07:00
Tim Wojtulewicz
8bbd885c40 CI: Drop macOS Ventura build, update FreeBSD 13 to 13.3 2024-07-31 11:28:08 -07:00
Tim Wojtulewicz
4fc0d1027d Update zeekctl submodule [nomail] 2024-07-31 11:18:39 -07:00
Tim Wojtulewicz
a1d621748e Merge remote-tracking branch 'origin/topic/johanna/gh-3700'
* origin/topic/johanna/gh-3700:
  Fix cid propagation into files.log

(cherry picked from commit d7e30d9ee2)
2024-07-26 12:47:16 -07:00
Tim Wojtulewicz
df37ccf73d Pick up an upstream CAF fix 2024-07-26 12:45:46 -07:00
Arne Welzel
c55a57a449 btest: Fixup baseline for plugins.hooks 2024-07-24 10:15:13 +02:00
Tim Wojtulewicz
32fb85e3f8 Update CHANGES, VERSION, and NEWS for the v6.0.4 release 2024-05-16 10:23:51 -07:00
Tim Wojtulewicz
275ecd7bf3 Update docs submodule [nomail] [skip ci] 2024-05-15 12:25:10 -07:00
Tim Wojtulewicz
d1e9cfe8e4 Update baseline for plugins.hooks btest 2024-05-15 10:49:26 -07:00
Tim Wojtulewicz
90ca0c16e4 Update broker submodule [nomail] 2024-05-15 10:49:26 -07:00
Christian Kreibich
1f04e5d545 Merge branch 'topic/christian/localversion'
* topic/christian/localversion:
  Parse and store localversion string
  Remove commented-out code
  Check ZEEK_VERSION_LOCAL for dashes
  Update version string btests for localversion
  Modify version parsing for localversion
  Update version used by spicyz
  Update build script
  Support for configurable localversion

(cherry picked from commit d09584e52e)
2024-05-14 16:09:58 -07:00
Tim Wojtulewicz
caa2df9ad1 Updating CHANGES and VERSION. 2024-05-14 15:21:59 -07:00
Tim Wojtulewicz
848b597416 Merge remote-tracking branch 'pbcullen/topic/pbcullen/remove_exclude'
* pbcullen/topic/pbcullen/remove_exclude:
  Update core.pcap.filter-warning baseline
  Add PacketFilter::remove_exclude function

(cherry picked from commit d566961da5)
2024-05-14 14:52:34 -07:00
Tim Wojtulewicz
e9decdccde Merge remote-tracking branch 'pbcullen/topic/pbcullen/shadow-file-handling'
* pbcullen/topic/pbcullen/shadow-file-handling:
  reformat changes
  Gracefully handle empty/missing shadow file

(cherry picked from commit ad6d70d4e6)
2024-05-14 14:51:36 -07:00
Christian Kreibich
2ccded3beb Merge branch 'topic/christian/3671-fix-icmp-caplen-violations'
* topic/christian/3671-fix-icmp-caplen-violations:
  Factor in caplens in ICMPAnalyzer::DeliverPacket length calculations

(cherry picked from commit 7fdbb73511)
2024-05-14 14:48:12 -07:00
Arne Welzel
c480b35ea0 Merge remote-tracking branch 'origin/topic/awelzel/bump-highwayhash'
* origin/topic/awelzel/bump-highwayhash:
  highwayhash: Point to github.com/google/highwayhash, bump to master

(cherry picked from commit 3734adef2d)
2024-05-14 14:42:15 -07:00
Tim Wojtulewicz
10fd5682e1 Merge remote-tracking branch 'origin/topic/johanna/update-tls-ca-stuff'
* origin/topic/johanna/update-tls-ca-stuff:
  Update Mozilla CA and Google CT list and related tests.

(cherry picked from commit c315202ece)
2024-05-14 14:38:31 -07:00
Tim Wojtulewicz
96170ebb41 Merge remote-tracking branch 'origin/topic/timw/spicy-1.8.4-bump-for-6.0.4' into release/6.0
* origin/topic/timw/spicy-1.8.4-bump-for-6.0.4:
  Bump commit hash for zeek-testing-cluster
  Bump spicy submodule to v1.8.4
2024-05-14 14:36:05 -07:00
Tim Wojtulewicz
8932781b0c Bump commit hash for zeek-testing-cluster 2024-05-14 13:49:31 -07:00
Tim Wojtulewicz
895c61e5f1 Bump spicy submodule to v1.8.4 2024-05-14 12:57:03 -07:00
Tim Wojtulewicz
269fdcdcfc Force Windows CI to use OpenSSL 3.1.1
There's something wrong with chocolatey's OpenSSL 3.2.0 package that
causes cmake to not be able to find libcrypto even though it's clearly
in the directory. Pinning to 3.1.1 fixes the build issue.

(cherry picked from commit 5a7c482a0f)
2024-05-14 10:56:59 -07:00
Jan Grashoefer
a69a584d25 Make worker restart in cluster btest race-proof
(cherry picked from commit 08daef8d42)
2024-05-14 10:52:28 -07:00