Commit graph

16055 commits

Author SHA1 Message Date
Dominik Charousset
f60a208b8d Forward OpenSSL include path to plugins 2023-08-29 20:05:41 +02:00
Tim Wojtulewicz
619113f674 Merge remote-tracking branch 'origin/topic/timw/remove-ubuntu-22-10'
* origin/topic/timw/remove-ubuntu-22-10:
  CI: Add ubuntu 23.04 build
  CI: Remove EOL ubuntu 22.10 build
2023-08-29 09:11:42 -07:00
Tim Wojtulewicz
ac82d4bcbd CI: Add ubuntu 23.04 build 2023-08-29 09:11:07 -07:00
Tim Wojtulewicz
b551bc9fc3 CI: Remove EOL ubuntu 22.10 build 2023-08-29 09:11:07 -07:00
Arne Welzel
c1edf2e276 Merge remote-tracking branch 'origin/topic/awelzel/pre-commit-autoupdate'
* origin/topic/awelzel/pre-commit-autoupdate:
  pre-commit: autoupdate
2023-08-29 09:39:20 +02:00
Arne Welzel
f766669b73 pre-commit: autoupdate
...except for clang-format, because versions after v13.0.0 have
borked the Whitesmith formatting. Also moves yapf from
pre-commit/mirrors-yapf to google/yapf.
2023-08-29 09:38:06 +02:00
zeek-bot
f4de133c12 Update doc submodule [nomail] [skip ci] 2023-08-29 00:28:06 +00:00
Dominik Charousset
80846a7971 Forward OpenSSL include path to plugins 2023-08-28 20:25:08 +02:00
Arne Welzel
d81cb9d10e Merge remote-tracking branch 'origin/topic/awelzel/ditch-file-krb-include'
* origin/topic/awelzel/ditch-file-krb-include:
  cmake: Bump submodule for removal of NEED_KRB5_H
  zeek-config.h: Drop NEED_KRB5_H
  File: Drop krb5.h include
2023-08-28 20:08:01 +02:00
Tim Wojtulewicz
9c15a2f6a6 Merge remote-tracking branch 'origin/topic/vern/trigger-constructor'
* origin/topic/vern/trigger-constructor:
  change Trigger constructor to not potentially auto-delete itself
2023-08-28 10:54:06 -07:00
Vern Paxson
e8f4e54475 change Trigger constructor to not potentially auto-delete itself 2023-08-28 10:17:26 -07:00
Arne Welzel
af1714853f http: Prevent request/response de-synchronization and unbounded state growth
When http_reply events are received before http_request events, either
through faking traffic or possible re-ordering, it is possible to trigger
unbounded state growth due to later http_requests never being matched
again with responses.

Prevent this by synchronizing request/response counters when late
requests come in.

Also forcefully flush pending requests when http_replies are never
observed either due to the analyzer having been disabled or because
half-duplex traffic.

Fixes #1705
2023-08-28 15:02:58 +02:00
Arne Welzel
8c2a9ec5f5 Update doc, cmake submodules for installing .spicy files 2023-08-28 12:57:21 +02:00
Arne Welzel
a84d6cd66c Merge branch 'topic/awelzel/3235-dont-flip-broadcasts'
* topic/awelzel/3235-dont-flip-broadcasts:
  testing: Bump external test suite
  dhcp: Handle is_orig=T for connections from server to 255.255.255.255
  IPBasedAnalyzer: Don't flip connections when destination is broadcast
2023-08-28 12:20:18 +02:00
Arne Welzel
4cabcd43c6 testing: Bump external test suite 2023-08-28 12:15:58 +02:00
Arne Welzel
fc768a9e01 dhcp: Handle is_orig=T for connections from server to 255.255.255.255
This works around the new semantics of is_orig=T for "connections"
from DHCP servers to broadcast addresses. IMO, having the server address
as originator in the conn.log is still more intuitive.
2023-08-28 12:15:55 +02:00
Arne Welzel
ba04f4c31d IPBasedAnalyzer: Don't flip connections when destination is broadcast
Closes #3235
2023-08-28 12:15:55 +02:00
Arne Welzel
7664bb6913 cmake: Bump submodule for removal of NEED_KRB5_H 2023-08-28 11:53:48 +02:00
Arne Welzel
33875c7bf0 zeek-config.h: Drop NEED_KRB5_H
This is unused in the Zeek tree after the previous commit, remove it
from zeek-config.h
2023-08-28 11:31:05 +02:00
Arne Welzel
18ae12f9e3 File: Drop krb5.h include
It looks as if krb5.h was only ever needed together with OpenSSL, then
OpenSSL includes were removed, but the krb5.h ones stayed around.

References:
610d081c4b
d7c10ca7c3
2023-08-28 11:31:05 +02:00
zeek-bot
8822555240 Update doc submodule [nomail] [skip ci] 2023-08-26 00:22:12 +00:00
Arne Welzel
de65671a0a Merge remote-tracking branch 'origin/topic/vern/GH-3191'
* origin/topic/vern/GH-3191:
  BTests for any/vector-of-any fixes
  fixes for vector assignments involving "any"/"vector of any" types
2023-08-25 21:43:03 +02:00
zeek-bot
b63e8fb544 Update doc submodule [nomail] [skip ci] 2023-08-25 00:31:47 +00:00
Vern Paxson
8e5dac3900 BTests for any/vector-of-any fixes 2023-08-24 15:49:13 -07:00
Vern Paxson
d70a0fae85 fixes for vector assignments involving "any"/"vector of any" types 2023-08-24 15:48:00 -07:00
Tim Wojtulewicz
ae03d591b8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Aug23'
* origin/topic/vern/script-opt-maint.Aug23:
  updated notes regarding "-O gen-C++" maintenance
  "-O gen-C++" support for "assert" statements
  addressed some nits re "-O gen-C++" script optimization
  fixes for compiling lambdas to C++
  fixes to avoid ambiguities in analyzing captures for script optimization
  disambiguate lambdas by adding scoping and consideration of captures
  addressed performance and correctness issues flagged by Coverity
2023-08-24 12:17:55 -07:00
Vern Paxson
1473149579 updated notes regarding "-O gen-C++" maintenance 2023-08-24 11:47:01 -07:00
Vern Paxson
81a9745fb3 "-O gen-C++" support for "assert" statements 2023-08-24 11:46:59 -07:00
Arne Welzel
9bbc3a55d4 Merge remote-tracking branch 'origin/topic/awelzel/serial-ppp-0x9'
* origin/topic/awelzel/serial-ppp-0x9:
  PPP: Add PPP analyzer to handle LINKTYPE_PPP (0x9)
2023-08-24 13:49:33 +02:00
zeek-bot
d5d600b360 Update doc submodule [nomail] [skip ci] 2023-08-24 00:16:53 +00:00
Tim Wojtulewicz
39478ebc78 Merge remote-tracking branch 'origin/topic/timw/python37-builds'
* origin/topic/timw/python37-builds:
  CI: Force alpine image to rebuild
  CI: Install python3.8 on older distros
  CI: Remove Ubuntu 18 build (EOL)
2023-08-23 13:05:14 -07:00
Tim Wojtulewicz
8d5b9a9293 CI: Force alpine image to rebuild 2023-08-23 11:12:19 -07:00
Tim Wojtulewicz
5b5a771339 CI: Install python3.8 on older distros 2023-08-23 09:49:36 -07:00
Tim Wojtulewicz
56ec2dfeba CI: Remove Ubuntu 18 build (EOL) 2023-08-23 09:49:36 -07:00
Arne Welzel
ee12a7a6e7 PPP: Add PPP analyzer to handle LINKTYPE_PPP (0x9)
Using pcaps from https://interop.seemann.io/ as samples for QUIC protocol
data didn't produce a conn.log for the contained data. `tcpdump -r`
and Wireshark do show the contained IP/UDP packets. Teach Zeek how
to handle link type DLT_PPP 0x09 using a new PPP analyzer based on the
PPPSerial analyzer code.

Usual update to files/x509 baseline after adding new analyzer due
to enum values changing.
2023-08-23 16:41:19 +02:00
Johanna Amann
70c76977cf 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
2023-08-23 12:46:21 +01:00
Johanna Amann
4156c4764a Community-id: load main script in notice script, fix notice script
This change makes the community-id script that adds the community id to
notice.log automatically load the main script if this was not already
loaded.

In the past, the script just did not perform any action if the main
script was not loaded.

This change also makes the notice script respect the seed/base64
settings that were set in the main script.

Fixes GH-3242
2023-08-22 15:09:47 +01:00
Robin Sommer
e8292be0ce
Merge remote-tracking branch 'origin/topic/robin/spicy-export-extensions'
* origin/topic/robin/spicy-export-extensions:
  [Spicy] Clean up representation of EVT record fields.
  [Spicy] Extend functionality of `export` in EVT files.
  [Spicy] Refactor parsing of `export` in EVT files.
2023-08-22 15:04:05 +02:00
Robin Sommer
36a6770e98
[Spicy] Clean up representation of EVT record fields. 2023-08-21 10:26:25 +02:00
Robin Sommer
cdadd934ce
[Spicy] Extend functionality of export in EVT files.
We now support selecting which fields of a unit type get exported into
the automatically created Zeek record; as well as selecting which
fields get a `&log` attribute added automatically to either all fields
or to selected fields.

Syntax:

- To export only selected fields:

    export Foo::X with { field1, field3 };

- To export all but selected fields:

    export Foo::X without { field2, field3 };

- To `&log` all fields:

    export Foo::X &log;

- To `&log` only selected fields:

    export Foo::X with { field1 &log, field3 }; # exports (only) field1 and field3, and marks field1 for logging

Syntax is still subject to change.

Closes #3218.
Closes #3219.
2023-08-21 10:26:25 +02:00
Arne Welzel
f5c339f246 Merge remote-tracking branch 'origin/topic/awelzel/shfmt-py-pin-to-latest'
* origin/topic/awelzel/shfmt-py-pin-to-latest:
  pre-commit: Pin to latest shfmt-py version
2023-08-17 16:35:45 +02:00
Arne Welzel
3082902d32 pre-commit: Pin to latest shfmt-py version
This allows users to run shfmt-py with Python > 3.9. Also drop
the explicit Python version for the setup-python action.
2023-08-17 16:30:50 +02:00
Vern Paxson
4928e074d4 addressed some nits re "-O gen-C++" script optimization 2023-08-16 17:04:39 -07:00
Vern Paxson
6af0014a7b fixes for compiling lambdas to C++ 2023-08-16 17:03:37 -07:00
Vern Paxson
4991693a9c fixes to avoid ambiguities in analyzing captures for script optimization 2023-08-16 17:00:57 -07:00
Vern Paxson
3e0f814635 disambiguate lambdas by adding scoping and consideration of captures 2023-08-16 16:58:05 -07:00
Vern Paxson
3925ff4592 addressed performance and correctness issues flagged by Coverity 2023-08-15 16:07:49 -07:00
Johanna Amann
61296ce052 Update broker submodule [nomail] 2023-08-15 17:40:40 +01:00
Johanna Amann
0b8b81f426 Merge remote-tracking branch 'origin/topic/johanna/posix_spawn'
* origin/topic/johanna/posix_spawn:
  Raw reader: better error handling for posix_spawn
  Raw reader: use posix_spawn instead of fork + exec
2023-08-15 17:34:25 +01:00
Tim Wojtulewicz
5637643798 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
2023-08-15 09:20:09 -07:00