Commit graph

19531 commits

Author SHA1 Message Date
Tim Wojtulewicz
dd881d9cde Merge remote-tracking branch 'origin/topic/etyp/bump-spicy-coverity'
* origin/topic/etyp/bump-spicy-coverity:
  Bump Spicy for Coverity fixes
2025-09-08 11:02:47 -07:00
Tim Wojtulewicz
76492302ad Merge remote-tracking branch 'origin/topic/timw/port-doctest-version-include-change-from-upstream'
* origin/topic/timw/port-doctest-version-include-change-from-upstream:
  Update src/3rdparty submodule for doctest v2.4.12 and include fix
2025-09-08 11:02:16 -07:00
Tim Wojtulewicz
168ff0b8a2 Update src/3rdparty submodule for doctest v2.4.12 and include fix 2025-09-08 10:52:06 -07:00
Evan Typanski
16a43f04bd Bump Spicy for Coverity fixes 2025-09-08 11:35:58 -04:00
Tim Wojtulewicz
37836d1bb4 Merge remote-tracking branch 'origin/topic/timw/ci-centos-stream-10'
* origin/topic/timw/ci-centos-stream-10:
  CI: Fix warning about ENV usage in CI dockerfiles
  CI: Add centos stream 10 build
2025-09-06 04:26:51 +00:00
Tim Wojtulewicz
7305a79440 CI: Fix warning about ENV usage in CI dockerfiles
This also bumps the dates on the DOCKERFILE_VERSION values
2025-09-06 04:26:03 +00:00
Tim Wojtulewicz
9bee00de9c CI: Add centos stream 10 build 2025-09-06 04:26:03 +00:00
Christian Kreibich
a58323c367 Merge branch 'topic/christian/fix-cluster-testing-get-instances-c2a'
* topic/christian/fix-cluster-testing-get-instances-c2a:
  Bump zeek-client to pull in more resilient controller I/O
2025-09-05 19:52:57 -07:00
Christian Kreibich
49ef0abd3b Bump zeek-client to pull in more resilient controller I/O 2025-09-05 16:26:57 -07:00
Tim Wojtulewicz
b7790641ba Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot
2025-09-05 12:56:33 -07:00
Benjamin Bannier
8fd8309b28 Bump auxil/spicy to latest development snapshot 2025-09-05 17:48:42 +02:00
Tim Wojtulewicz
35ad76c96b Merge remote-tracking branch 'origin/topic/timw/testing-upstream-libkqueue'
* origin/topic/timw/testing-upstream-libkqueue:
  libkqueue: Switch to using HEAD from upstream master
2025-09-04 16:22:04 -07:00
Tim Wojtulewicz
d1f34ae546 libkqueue: Switch to using HEAD from upstream master
The upstream recently merge Christian's fixes for the fd_map allocations
so that patch doesn't need to be in our fork anymore. I also tested removing
the patch about timers from our fork, and it seems to only matter for Linux
kernels earlier than 5.3. All of our supported platforms are newer than
that.
2025-09-04 16:20:18 -07:00
Tim Wojtulewicz
0dadf2af04 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot
2025-09-04 09:04:39 -07:00
Benjamin Bannier
a48b4caabc Bump auxil/spicy to latest development snapshot 2025-09-04 17:01:46 +02:00
zeek-bot
dc7b331450 Update doc submodule [nomail] [skip ci] 2025-09-04 00:28:10 +00:00
Tim Wojtulewicz
4d338ccd7d Fix clang-tidy warning from recent SVCB merge 2025-09-03 16:50:07 -07:00
Tim Wojtulewicz
cff4edd732 NEWS: Add note about DNS SVCB changes 2025-09-03 15:38:47 -07:00
Tim Wojtulewicz
7142b9efde Merge remote-tracking branch 'klemensya/svcparams'
* klemensya/svcparams:
  Parse SVCB/HTTPS SvcParams list
2025-09-03 15:36:03 -07:00
Tim Wojtulewicz
26ea7cc655 Clang-tidy fixes for recent IDPtr changes 2025-09-03 15:34:29 -07:00
Tim Wojtulewicz
e3b22cd21f Merge remote-tracking branch 'origin/topic/vern/emphasize-IDPtrs'
* origin/topic/vern/emphasize-IDPtrs:
  fixup! fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
  fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
  fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
  fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
  annotate a number of BTests as unsuited for -O gen-C++ testing due to multiple Zeek runs
  BTest baseline updates for -O gen-C++ - all minor tweaks
  BTest updates for script optimization tracking of BiFs
  regression test for former ASAN issue with script optimization of lambdas
  shift much of the internal use of ID* identifier pointers over to IDPtr objects
  maintenance update for script optimization's knowledge of BiFs
  logger fix for interoperability with -O gen-C++ code
2025-09-03 15:33:43 -07:00
Evan Typanski
42f7a2d88c Merge remote-tracking branch 'origin/topic/vern/field-assign-parsing'
* origin/topic/vern/field-assign-parsing:
  tightened up parsing of $field=X record constructor expressions
2025-09-03 16:21:24 -04:00
Vern Paxson
3ff3eee398 fixup! fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects 2025-09-03 12:42:58 -07:00
Vern Paxson
a6f9d69c91 fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects 2025-09-03 11:20:29 -07:00
Vern Paxson
7397dc6568 fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects 2025-09-03 11:19:38 -07:00
Vern Paxson
34831aa7d3 fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects 2025-09-03 11:19:38 -07:00
Vern Paxson
b6b8484819 annotate a number of BTests as unsuited for -O gen-C++ testing due to multiple Zeek runs 2025-09-03 11:19:38 -07:00
Vern Paxson
77bb32ff78 BTest baseline updates for -O gen-C++ - all minor tweaks 2025-09-03 11:19:38 -07:00
Vern Paxson
1b4bc72802 BTest updates for script optimization tracking of BiFs 2025-09-03 11:19:38 -07:00
Vern Paxson
e9971e31d5 regression test for former ASAN issue with script optimization of lambdas 2025-09-03 11:19:38 -07:00
Vern Paxson
693aa244f9 shift much of the internal use of ID* identifier pointers over to IDPtr objects 2025-09-03 11:19:31 -07:00
Vern Paxson
1c7c1b62f6 maintenance update for script optimization's knowledge of BiFs 2025-09-03 11:14:22 -07:00
Vern Paxson
fb344a20ea logger fix for interoperability with -O gen-C++ code 2025-09-03 11:14:22 -07:00
Benjamin Bannier
07dd2a1c6f Merge branch 'topic/bbannier/test-bittorrent-unnessary-sigs' 2025-09-03 14:51:16 +02:00
Klemens Nanni
397f7e5c0e Parse SVCB/HTTPS SvcParams list
Add full support for RFC 9460's SvcParams list.

Amend the existing `dns_svcb_rr` record by a vector of new
`dns_svcb_param` records containing aptly typed SvcParamKey and
SvcParamValue pairs.  Example output:

```
@load base/protocols/dns
event dns_HTTPS( c: connection , msg: dns_msg , ans: dns_answer , https: dns_svcb_rr ) {
	for (_, param in https$svc_params)
		print to_json(param);  # filter uninitialised values
}
```

```
$ dig https cloudflare-ech.com +short | tr [:space:] \\n
1
.
alpn="h3,h2"
ipv4hint=104.18.10.118,104.18.11.118
ech=AEX+DQBBHgAgACBGL2e9TiFwjK/w1Zg9AmRm7mgXHz3PjffP0mTFNMxmDQAEAAEAAQASY2xvdWRmbGFyZS1lY2guY29tAAA=
ipv6hint=2606:4700::6812:a76,2606:4700::6812:b76
```

```
{"key":1,"alpn":["h3","h2"]}
{"key":4,"hint":["104.18.10.118","104.18.11.118"]}
{"key":5,"ech":"AEX+DQBBHgAgACBGL2e9TiFwjK/w1Zg9AmRm7mgXHz3PjffP0mTFNMxmDQAEAAEAAQASY2xvdWRmbGFyZS1lY2guY29tAAA="}
{"key":6,"hint":["2606:4700::6812:a76","2606:4700::6812:b76"]}
```

Values with malformed data or belonging to invalid/reserved keys
are passed raw bytes in network order for script-level inspection.

Follow up to "Initial Support to DNS SVCB/HTTPS RR"
https://github.com/zeek/zeek/pull/1808
2025-09-03 09:53:55 +03:00
Tim Wojtulewicz
5d93254400 Merge remote-tracking branch 'origin/topic/timw/remove-unneeded-binpac-includes'
* origin/topic/timw/remove-unneeded-binpac-includes:
  Remove some unnecessary #includes from binpac source files
2025-09-02 16:00:27 -07:00
Tim Wojtulewicz
adb28453a7 Remove some unnecessary #includes from binpac source files 2025-09-02 11:52:52 -07:00
Tim Wojtulewicz
deeca84332 Merge remote-tracking branch 'origin/topic/timw/readability-container-contains'
* origin/topic/timw/readability-container-contains:
  Fix a few more random clang-tidy findings
  Use std::numbers::pi instead of hard-coded value
  Use std::scoped_lock instead of std::lock_guard
  Use .contains() instead of .find() or .count()
2025-09-02 11:49:29 -07:00
Tim Wojtulewicz
3c7885abdf Fix a few more random clang-tidy findings 2025-09-02 16:51:34 +00:00
Tim Wojtulewicz
aa3940f16d Use std::numbers::pi instead of hard-coded value 2025-09-02 16:51:23 +00:00
Tim Wojtulewicz
66aefc6a54 Use std::scoped_lock instead of std::lock_guard 2025-09-02 16:42:52 +00:00
Tim Wojtulewicz
b592b6c998 Use .contains() instead of .find() or .count() 2025-09-02 16:42:52 +00:00
Benjamin Bannier
4c9cbeb43f Remove unnecessary peer signature from test scripts.base.protocols.bittorrent.tracker 2025-09-02 10:53:38 +02:00
Vern Paxson
36862a18d6 tightened up parsing of $field=X record constructor expressions 2025-08-31 15:14:26 -07:00
zeek-bot
d63e3f9706 Update doc submodule [nomail] [skip ci] 2025-08-31 00:17:01 +00:00
Christian Kreibich
f38ac30418 Merge branch 'topic/christian/management-framework-tls'
* topic/christian/management-framework-tls:
  Bump zeek-testing-cluster to pull in WebSocket TLS updates
  Bump zeek-client to pull in TLS config updates
  Management framework: add TLS options for controller's websocket server
2025-08-29 21:53:37 -07:00
Christian Kreibich
236d3a1ced Bump zeek-testing-cluster to pull in WebSocket TLS updates 2025-08-29 17:20:15 -07:00
Christian Kreibich
779f7064ad Bump zeek-client to pull in TLS config updates 2025-08-29 17:20:10 -07:00
Tim Wojtulewicz
d20550f553 Merge remote-tracking branch 'origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24'
* origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24:
  Move benchmarking to Ubnutu 24 task, add to normal PR builds
  Reorder ubuntu builds so 22.04 comes last
  Rename Ubuntu-based tasks to have the full version name
  Switch Zeek Spicy builds to Ubuntu 24
2025-08-29 15:08:38 -07:00
Arne Welzel
b014e8e56e Management framework: add TLS options for controller's websocket server 2025-08-29 12:44:07 -07:00