Commit graph

15173 commits

Author SHA1 Message Date
Tim Wojtulewicz
1c84aa0d53 Update docs submodule for v6.0.1 [nomail] 2023-09-12 13:37:49 -07:00
Tim Wojtulewicz
684a9b3624 Updating CHANGES and VERSION. 2023-09-12 12:47:58 -07:00
Tim Wojtulewicz
8e04583831 Remove EOL Ubuntu 22.10 build, update Ubuntu 22.04 docker image 2023-09-12 11:17:35 -07:00
Tim Wojtulewicz
850723400e Update CHANGES, VERSION, and NEWS for 6.0.1 release 2023-09-12 10:12:49 -07:00
Tim Wojtulewicz
f0bf803dd2 Update dump_events test baseline after fseek changes 2023-09-12 09:41:10 -07:00
Johanna Amann
3c3a3c92ea Add extract_limit_includes_missing option for file extraction
Setting this option to false does not count missing bytes in files towards the
extraction limits, and allows to extract data up to the desired limit,
even when partial files are written.

When missing bytes are encountered, files are now written as sparse
files.

Using this option requires the underlying storage and utilities to support
sparse files.

(cherry picked from commit afa6f3a0d3b8db1ec5b5e82d26225504c2891089)
2023-09-12 09:41:03 -07:00
Johanna Amann
9ab61fb626 File extraction: use fseek
In the past, we allocated a buffer with zeroes and wrote that with
fwrite. Now, instead we just fseek to the correct offset.

This changes the way in which the file extract limit is counted a bit;
skipped bytes do no longer count against the file size limit.

(cherry picked from commit 5071592e9b7105090a1d9de19689c499070749d4)
2023-09-12 09:40:56 -07:00
Arne Welzel
a96bcef839 ftp: Do not log non-pending commands
OSS Fuzz generated a CWD request and reply followed by very many EPRT
requests. This caused Zeek to re-log the CWD request and invoke `build_url_ftp()`
over and over again resulting in long processing times.

Avoid this scenario by not logging commands that aren't pending anymore.

(cherry picked from commit b05dd31667ff634ec7d017f09d122f05878fdf65)
2023-09-12 09:40:51 -07:00
Arne Welzel
3724c14ad2 http/smtp: Fix wrong character class usage
A call to `extract_filename_from_content_disposition()` is only
efficient if the string is guaranteed to contain the pattern that
is removed by `sub()`. Due to missing brackets around the `[:blank:]`
character class, an overly long string (756kb) ending in
"Type:dtanameaa=" matched the wrong pattern causing `sub()` to
exhibit quadratic runtime. Besides that, we may have potentially
extracted wrong information from a crafted header value.

(cherry picked from commit 6d385b1ca724a10444865e4ad38a58b31a2e2288)
2023-09-12 09:40:38 -07:00
Tim Wojtulewicz
ef19a30015 Make sure that all sessions/connections are done before deleting plugins
(cherry picked from commit e29b499a211137cf3cf0c24a4ff82db1b806f132)
2023-09-12 09:40:32 -07:00
Tim Wojtulewicz
02af9a9787 VLAN: Fix length checking for non-Ethernet type 2 frames
(cherry picked from commit c579eb7b7cf3ca1d9008e74d7934155866c7e4f7)
2023-09-12 09:40:27 -07:00
Arne Welzel
a0c384015a Merge remote-tracking branch 'origin/topic/awelzel/dns-mgr-fixes'
* origin/topic/awelzel/dns-mgr-fixes:
  DNS_Mgr: Use Process() for timeout expiration
  DNS_Mgr: Fix GetNextTimeout() returning absolute values

(cherry picked from commit 1441b83411)
2023-09-08 11:10:16 -07:00
Arne Welzel
fe9c7d4191 Merge remote-tracking branch 'origin/topic/jazoff/gh-3268t '
* origin/topic/jazoff/gh-3268:
  Fix check for emailed notices

Changes: Added a test-case printing email_delay_tokens to compare email vs
non-email notice types. Previously, both notice types would have email
delay tokens at that point in the flow.

(cherry picked from commit 7e11501d3c)
2023-09-08 11:09:56 -07:00
Tim Wojtulewicz
8507d58141 Update CHANGES, VERSION, and NEWS 2023-09-07 18:32:06 -07:00
Arne Welzel
c413c6d71a Merge remote-tracking branch 'origin/topic/awelzel/3278-spicy-fix-port-range-off-by-one'
* origin/topic/awelzel/3278-spicy-fix-port-range-off-by-one:
  spicy: Do not register port N+1 for port N in .evt file

(cherry picked from commit 6e6a2bee8a)
2023-09-07 18:13:48 -07:00
Christian Kreibich
846d764886 Updating auxil/zeek-client submodule [nomail]
(cherry picked from commit 21562cfbb2)
2023-09-07 18:12:35 -07:00
Tim Wojtulewicz
973bdbec19 Merge remote-tracking branch 'origin/topic/neverlord/gh-3247'
* origin/topic/neverlord/gh-3247:
  Forward OpenSSL include path to plugins

(cherry picked from commit 19719b1862)
2023-08-29 12:15:20 -07:00
Johanna Amann
ab2b241c3f Merge remote-tracking branch 'origin/topic/johanna/gh-3242'
* origin/topic/johanna/gh-3242:
  Community-id: load main script in notice script, fix notice script

(cherry picked from commit 70c76977cf)
2023-08-23 10:16:45 -07:00
Tim Wojtulewicz
d4036f423d Update NEWS for upcoming 6.0.1 release 2023-08-22 12:42:19 -07:00
Tim Wojtulewicz
38d951964d CI: refresh all docker images, fix package installation on opensuse-tumbleweed 2023-08-16 15:10:09 -07:00
Tim Wojtulewicz
c7cfeeb572 Update scripts.policy.misc.dump-events baseline for connection flipping PR 2023-08-16 11:05:34 -07:00
Tim Wojtulewicz
1e348d885d CI: update freebsd to 13.2 and 12.4
(cherry picked from commit 6761aebef7)
2023-08-16 10:14:40 -07:00
Tim Wojtulewicz
68024570fa Merge remote-tracking branch 'origin/topic/timw/pre-commit-python-version'
* origin/topic/timw/pre-commit-python-version:
  Force pre-commit to use python 3.9

(cherry picked from commit 5637643798)
2023-08-16 10:01:42 -07:00
Arne Welzel
bde9c7070e Conn: In-place val flip and connection_flipped()
Avoids loosing state on a connection value when a connection is flipped.

Fixes up the NTP baseline as well where this was visible: analyzer_confirmation_info()
was raised for a connection value which was immediately forgotten due to
the subsequent connection flipping.

Closed #3028

(cherry picked from commit a2214ad611)
2023-08-16 09:57:33 -07:00
Arne Welzel
7eca88c094 Merge remote-tracking branch 'origin/topic/timw/tsan-upgrade'
* origin/topic/timw/tsan-upgrade:
  Suppress new tsan findings from Ubuntu 22 upgrade
  Update tsan build to ubuntu22

(cherry picked from commit bb9faab83b)
2023-08-09 15:57:39 -07:00
Tim Wojtulewicz
a034c97f4d Merge remote-tracking branch 'origin/topic/bbannier/issue-3177'
* origin/topic/bbannier/issue-3177:
  Explicitly link Zeek executable against Spicy libraries in binary packaging mode.

(cherry picked from commit 4022573d48)
2023-08-09 09:11:09 -07:00
Johanna Amann
483f7a0322 Merge remote-tracking branch 'origin/topic/johanna/tcp-padding'
* origin/topic/johanna/tcp-padding:
  Do not forward padding to downstream TCP packet analyzer

(cherry picked from commit 81ce83590d)
2023-08-08 13:36:16 -07:00
Tim Wojtulewicz
a99231d956 Merge remote-tracking branch 'origin/topic/johanna/3205-do-not-parse-udp-padding'
* origin/topic/johanna/3205-do-not-parse-udp-padding:
  Do not forward more than the remaining data to downstream UDP analyzer

(cherry picked from commit 3c7a52d0a7)
2023-08-08 13:22:18 -07:00
Benjamin Bannier
8ef9498c00 Prefer Spicy include directories of this build over accidental ones.
Closes #3153.

(cherry picked from commit c718f7f632)
2023-08-08 13:15:43 -07:00
Tim Wojtulewicz
5811e58139 Merge remote-tracking branch 'origin/topic/awelzel/3145-dcerpc-state-clean'
* origin/topic/awelzel/3145-dcerpc-state-clean:
  dce-rpc: Test cases for unbounded state growth
  dce-rpc: Handle smb2_close_request() in scripts
  smb/dce-rpc: Cleanup DCE-RPC analyzers when fid is closed and limit them
  dce-rpc: Do not repeatedly register removal hooks

(cherry picked from commit f9904511ab)
2023-08-08 12:55:21 -07:00
Arne Welzel
c19069acdb Merge remote-tracking branch 'origin/topic/timw/3163-gperftools-build'
* origin/topic/timw/3163-gperftools-build:
  Define early_shutdown lambda earlier in zeek-setup, avoids build failure with gperftools

(cherry picked from commit 2da6f94ab6)
2023-08-08 12:55:03 -07:00
Robin Sommer
ddaa553418 Merge remote-tracking branch 'origin/topic/robin/gh-3157-export-switch'
* origin/topic/robin/gh-3157-export-switch:
  [Spicy] Support `switch` fields when exporting Spicy types to Zeek.

(cherry picked from commit cd2c193cb2)
2023-08-08 12:54:21 -07:00
Arne Welzel
4ae02b7973 Merge branch 'master' of https://github.com/progmboy/zeek
* 'master' of https://github.com/progmboy/zeek:
  fix http AUTHORIZATION base64 decode failed

Added a test during merge.

(cherry picked from commit b18122da08)
2023-08-08 12:51:51 -07:00
Tim Wojtulewicz
03b4a04b8d Updating CHANGES and VERSION. 2023-07-05 10:24:03 -07:00
Christian Kreibich
e0a458765c Update btest, package-manager, and zeek-client submodules [nomail] [skip ci] 2023-07-05 10:17:38 -07:00
Tim Wojtulewicz
d6ad7f56c5 Merge remote-tracking branch 'origin/topic/bbannier/issue-3101' into release/6.0
* origin/topic/bbannier/issue-3101:
  Bump Spicy to latest release.
2023-07-05 08:30:51 -07:00
Benjamin Bannier
5723d533a9 Bump Spicy to latest release.
This bumps Spicy to 1.8.1 which fixes #3101.
2023-07-05 10:59:27 +02:00
Arne Welzel
b057d1a9a7 Update zeekjs submodule to 0.9.4 2023-06-30 17:34:05 +02:00
Tim Wojtulewicz
2644f9f815 Update cmake submodule for cp -R fix 2023-06-27 16:59:50 -07:00
Arne Welzel
052a049d59 Update package-manager submodule 2023-06-27 19:00:46 +02:00
Tim Wojtulewicz
556694512f Updating CHANGES and VERSION. 2023-06-22 10:23:10 -07:00
Tim Wojtulewicz
c2c8293931 Update docs submodule [nomail] [skip ci] 2023-06-22 10:18:33 -07:00
Tim Wojtulewicz
0a3f185608 Update zeekjs to version 0.9.3 2023-06-21 15:44:32 -07:00
Tim Wojtulewicz
796e017ed0 Update broker submodule 2023-06-21 15:43:49 -07:00
Tim Wojtulewicz
36fb655caa Merge remote-tracking branch 'origin/topic/awelzel/no-metrics-centralization'
* origin/topic/awelzel/no-metrics-centralization:
  telemetry: Disable metrics centralization by default

(cherry picked from commit 0fbfaeb996)
2023-06-21 15:42:10 -07:00
Tim Wojtulewicz
0c6f3bacf0 Merge remote-tracking branch 'origin/topic/johanna/gh-3144'
* origin/topic/johanna/gh-3144:
  GSSAPI: basic support for MIC/WRAP tokens

(cherry picked from commit 93988d6db6)
2023-06-21 15:41:32 -07:00
Tim Wojtulewicz
6a033d5aed Merge remote-tracking branch 'origin/topic/awelzel/3143-no-more-zeekurity' into release/6.0
* origin/topic/awelzel/3143-no-more-zeekurity:
  cirrus: Stop pushing container images to zeekurity
2023-06-21 11:47:15 -07:00
Tim Wojtulewicz
9b95683a80 Merge remote-tracking branch 'origin/topic/timw/opensuse-tumbleweed-python-sqlite'
* origin/topic/timw/opensuse-tumbleweed-python-sqlite:
  CI: Force rebuild of tumbleweed VM to pick up newer version of python

(cherry picked from commit 46715dacfd)
2023-06-21 11:46:30 -07:00
Arne Welzel
99e668dc06 cirrus: Stop pushing container images to zeekurity
Closes #3143
2023-06-21 19:07:59 +02:00
Tim Wojtulewicz
cc528ce10b Update cmake submodule [nomail] 2023-06-16 09:12:56 -07:00