Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
16781 commits 387 branches 195 tags 255 MiB
Commit graph

16781 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arne Welzel
b5774f2de9 Merge remote-tracking branch 'origin/topic/vern/ZAM-field-assign-in-op' 
* origin/topic/vern/ZAM-field-assign-in-op:
  pre-commit: Bump spicy-format to 0.23
  fix for ZAM optimization of assigning a record field to result of "in" operation

(cherry picked from commit 991bc9644d)
 2025-03-18 16:13:01 -07:00
Tim Wojtulewicz
7c8a7680ba Update CHANGES, VERSION, and NEWS for 7.0.5 release 2024-12-16 11:12:48 -07:00
Tim Wojtulewicz
26b50908e1 Merge remote-tracking branch 'security/topic/timw/7.0.5-patches' into release/7.0 
* security/topic/timw/7.0.5-patches:
  QUIC/decrypt_crypto: Actually check if decryption was successful
  QUIC/decrypt_crypto: Limit payload_length to 10k
  QUIC/decrypt_crypto: Fix decrypting into too small stack buffer
 2024-12-16 10:21:59 -07:00
Arne Welzel
c2f2388f18 QUIC/decrypt_crypto: Actually check if decryption was successful 
...and bail if it wasn't.

PCAP was produced using OSS-Fuzz input from issue 383379789.
 2024-12-13 13:10:45 -07:00
Arne Welzel
d745d746bc QUIC/decrypt_crypto: Limit payload_length to 10k 
Given we dynamically allocate memory for decryption, employ a limit
that is unlikely to be hit, but allows for large payloads produced
by the fuzzer or jumbo frames.
 2024-12-13 13:10:45 -07:00
Arne Welzel
5fbb6b4599 QUIC/decrypt_crypto: Fix decrypting into too small stack buffer 
A QUIC initial packet larger than 1500 bytes could lead to crashes
due to the usage of a fixed size stack buffer for decryption.

Allocate the necessary memory dynamically on the heap instead.
 2024-12-13 13:10:45 -07:00
Tim Wojtulewicz
7c463b5f92 Update docs submodule [nomail] [skip ci] 2024-12-13 13:08:51 -07:00
Tim Wojtulewicz
e7f694bcbb Merge remote-tracking branch 'origin/topic/vern/ZAM-tbl-iteration-memory-mgt-fix' 
* origin/topic/vern/ZAM-tbl-iteration-memory-mgt-fix:
  fix for memory management associated with ZAM table iteration

(cherry picked from commit 805e9db588)
 2024-12-13 12:27:16 -07:00
Arne Welzel
f54416eae4 Merge remote-tracking branch 'origin/topic/christian/fix-zam-analyzer-name' 
* origin/topic/christian/fix-zam-analyzer-name:
  Fix ZAM's implementation of Analyzer::name() BiF

(cherry picked from commit e100a8e698)
 2024-12-12 13:14:10 -07:00
Arne Welzel
68bfe8d1c0 Merge remote-tracking branch 'origin/topic/vern/zam-exception-leaks' 
* origin/topic/vern/zam-exception-leaks:
  More robust memory management for ZAM execution - fixes #4052

(cherry picked from commit c3b30b187e)
 2024-12-12 13:05:13 -07:00
Arne Welzel
cf97ed6ac1 Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-14-0' 
* origin/topic/awelzel/bump-zeekjs-0-14-0:
  Bump zeekjs to v0.14.0

(cherry picked from commit aac640ebff)
 2024-12-12 12:45:14 -07:00
Benjamin Bannier
35cd891d6e Merge remote-tracking branch 'origin/topic/bbannier/doc-have-spicy' 
(cherry picked from commit 4a96d34af6)
 2024-12-12 12:43:43 -07:00
Tim Wojtulewicz
f300ddb9fe Update CHANGES, VERSION, and NEWS for 7.0.4 release 2024-11-19 12:35:32 -07:00
Arne Welzel
fa5a7c4a5b Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-13-2' 
* origin/topic/awelzel/bump-zeekjs-0-13-2:
  Bump zeekjs to 0.13.2

(cherry picked from commit 6e916efe8d)
 2024-11-19 11:19:31 -07:00
Tim Wojtulewicz
56b596a3e3 Merge remote-tracking branch 'origin/topic/timw/speed-up-zam-ci-testing' 
* origin/topic/timw/speed-up-zam-ci-testing:
  CI: Use test.sh script for running ZAM tests, but disable parts of it

(cherry picked from commit d9a74680e0)
 2024-11-19 10:56:28 -07:00
Tim Wojtulewicz
91067b32cc Update docs submodule [nomail] [skip ci] 2024-11-19 09:43:20 -07:00
Arne Welzel
43ab74b70f Merge branch 'sqli-spaces-encode-to-plus' of https://github.com/cooper-grill/zeek 
* 'sqli-spaces-encode-to-plus' of https://github.com/cooper-grill/zeek:
  account for spaces encoding to plus signs in sqli regex detection

(cherry picked from commit 5200b84fb3)
 2024-11-19 09:33:22 -07:00
Arne Welzel
887d92e26c Merge remote-tracking branch 'upstream/topic/awelzel/3774-skip-script-args-test-under-tsan' 
* upstream/topic/awelzel/3774-skip-script-args-test-under-tsan:
  btest: Skip core.script-args under TSAN

(cherry picked from commit 159f40a4bf)
 2024-11-14 19:07:51 -07:00
Tim Wojtulewicz
b1fec3284e Disable core.expr-execption btest under ZAM to fix CI builds 2024-11-14 16:04:41 -07:00
Tim Wojtulewicz
5ce0f2edb6 Fix ubsan warning with ZAM and mmdb btest 2024-11-14 13:14:58 -07:00
Tim Wojtulewicz
d5c3cdf33a Update doc submodule [nomail] [skip ci] 2024-11-14 13:02:08 -07:00
Arne Welzel
7ed52733d2 Merge remote-tracking branch 'origin/topic/awelzel/asan-zam-ci' 
* origin/topic/awelzel/asan-zam-ci:
  ci: Add asan and ubsan sanitizer tasks for ZAM

(cherry picked from commit 8945b2b186)
 2024-11-14 12:16:33 -07:00
Arne Welzel
056b70bd2d Merge remote-tracking branch 'origin/topic/awelzel/community-id-new-connection' 
* origin/topic/awelzel/community-id-new-connection:
  policy/community-id: Populate conn$community_id in new_connection()

(cherry picked from commit d3579c1f34)
 2024-11-14 12:15:27 -07:00
Tim Wojtulewicz
f697670668 Update zeekjs submodule to latest tagged version 
This picks up the changes to support Node.js v22.11.0.
 2024-11-14 12:07:00 -07:00
Benjamin Bannier
826d5e6fb7 Merge remote-tracking branch 'origin/topic/etyp/cookie-nullptr-spicy-dpd' 
(cherry picked from commit 1d38c31071)
 2024-11-14 11:59:05 -07:00
Benjamin Bannier
1c3be97fe9 Merge remote-tracking branch 'origin/topic/bbannier/spicy-cookie-nullptr-deref' 
(cherry picked from commit 2e8d6e86e7)
 2024-11-14 11:56:53 -07:00
Evan Typanski
107c0da15d Fix up minor warnings in touched files 
(cherry picked from commit 36af0591a6)
 2024-11-14 11:53:29 -07:00
Evan Typanski
e3845060dc Fix Clang 19 deprecation failure 
Fixes #3994

Clang 19 with libc++ started failing to compile because the default
implementation of `std::char_traits` was removed, making uses of
`std::char_traits<unsigned char>` invalid. This was more of used for
convenience before, but it should be roughly the same behavior with
`char`.

See relevant LLVM commits:

aeecef08c3

08a0faf4cd
(cherry picked from commit 985f4f7c72)
 2024-11-14 11:52:23 -07:00
Arne Welzel
34ef830b9c Merge remote-tracking branch 'origin/topic/awelzel/3978-zeekjs-0.12.1-bump' 
* origin/topic/awelzel/3978-zeekjs-0.12.1-bump:
  Bump zeekjs to 0.12.1

(cherry picked from commit d74b073852)
 2024-11-14 11:33:38 -07:00
Arne Welzel
3ebe867193 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 11:32:17 -07:00
Christian Kreibich
300b7a11ac 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 11:30:55 -07:00
Tim Wojtulewicz
f5fefd17df Merge remote-tracking branch 'origin/topic/vern/zam-fixes-for-7.0.x' into release/7.0 
* origin/topic/vern/zam-fixes-for-7.0.x:
  import of GH-4022 BTest additions ZAM baseline update
  fix for setting object locations to avoid use-after-free situation
  fixes for script optimization of coerce-to-any expressions
  porting of GH-4022
  porting of GH-4016
  porting of GH-4013
  fixed access to uninitialized memory in ZAM's "cat" built-in
 2024-11-14 10:22:07 -07:00
Vern Paxson
3281aa6284 import of GH-4022 BTest additions 
ZAM baseline update
 2024-11-14 10:19:07 -07:00
Vern Paxson
bcfd47c28d fix for setting object locations to avoid use-after-free situation 2024-11-14 10:19:07 -07:00
Vern Paxson
10d5ca5948 fixes for script optimization of coerce-to-any expressions 2024-11-14 10:19:07 -07:00
Vern Paxson
f693f22192 porting of GH-4022 2024-11-12 15:41:20 -08:00
Vern Paxson
c86f9267ff porting of GH-4016 2024-11-11 11:54:15 -08:00
Vern Paxson
dfbeb3e71f porting of GH-4013 2024-11-11 11:38:04 -08:00
Vern Paxson
fabb4023c9 fixed access to uninitialized memory in ZAM's "cat" built-in 2024-11-11 10:54:23 -08:00
Christian Kreibich
9eb3ada8c8 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:15:51 -07:00
Christian Kreibich
7a73f81792 Update CHANGES, VERSION, and NEWS for 7.0.3 release 2024-10-04 15:42:59 -07:00
Christian Kreibich
ea44c30272 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:46:40 -07:00
Christian Kreibich
c988bd2e4d Update docs submodule [nomail] [skip ci] 2024-10-04 10:28:35 -07:00
Christian Kreibich
5579494d48 Merge branch 'topic/bbannier/bump-spicy' into release/7.0 
* topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest release
 2024-10-04 09:56:47 -07:00
Benjamin Bannier
121170a5de Merge remote-tracking branch 'origin/topic/bbannier/ci-opensuse-leap-ps-dep' 
(cherry picked from commit a27066e3fc)
 2024-10-04 09:53:29 -07:00
Benjamin Bannier
0e4f2a2bab Bump auxil/spicy to latest release 2024-10-02 12:39:26 +02:00
Tim Wojtulewicz
270429bfea Update CHANGES, VERSION, and NEWS for 7.0.2 release 2024-09-23 12:15:32 -07:00
Tim Wojtulewicz
815001f2aa Update docs submodule [nomail] [skip ci] 2024-09-23 11:58:24 -07:00
Tim Wojtulewicz
88c37d0be8 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 11:12:54 -07:00
Johanna Amann
40db8463df 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 10:27:19 -07:00