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
Tim Wojtulewicz
965d1de3f6
Merge remote-tracking branch 'origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup'
...
* origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup:
tests: Do not use archiver_rotation_format_func as postprocessor
(cherry picked from commit 9e2e6d0174
2023-06-15 15:56:24 -07:00
Arne Welzel
7e2d9aa7be
Merge branch 'topic/awelzel/3112-log-suffix-left-over-log-rotation'
...
* topic/awelzel/3112-log-suffix-left-over-log-rotation:
cluster/logger: Fix leftover-log-rotation in multi-logger setups
cluster/logger: Fix global var reference
(cherry picked from commit f53aefdd5b
2023-06-15 15:21:02 -07:00
Arne Welzel
9b0947f918
Merge remote-tracking branch 'origin/topic/robin/spicy-news'
...
* origin/topic/robin/spicy-news:
Add Spicy updates to NEWS for 6.0.
(cherry picked from commit f3b306a2ec
2023-06-15 13:27:30 -07:00
Arne Welzel
7ef1099d37
Merge remote-tracking branch 'origin/topic/awelzel/3115-debian-12'
...
* origin/topic/awelzel/3115-debian-12:
NEWS: Add entry about Debian 12
docker: Add libnode to enable JavaScript support
docker: Bump images to Debian 12
(cherry picked from commit 84d605602f
2023-06-15 13:21:17 -07:00
Tim Wojtulewicz
669dd14adf
Merge remote-tracking branch 'origin/topic/timw/force-std-c++-17'
...
* origin/topic/timw/force-std-c++-17:
Force -std=c++17 mode for plugin targets, remove use of RequireCXX17.cmake
(cherry picked from commit 48af56c00b
2023-06-15 13:04:27 -07:00
Arne Welzel
8ee9b3c9e4
Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-doctest-defines'
...
* origin/topic/awelzel/3090-propagate-doctest-defines:
Options: Do not output full usage on --test error
CMakeLists: Propagate DOCTEST defines to external plugins
(cherry picked from commit 2fddddbf51
2023-06-15 13:03:08 -07:00
Arne Welzel
413610b5c0
Merge remote-tracking branch 'origin/topic/awelzel/3090-add-back-rapidjson'
...
* origin/topic/awelzel/3090-add-back-rapidjson:
CMakeLists: Add rapidjson/include to zeek_dynamic_plugin_base
(cherry picked from commit 1d6585e1a0
2023-06-15 13:03:00 -07:00
Arne Welzel
ac63f727f7
Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-build-type'
...
* origin/topic/awelzel/3090-propagate-build-type:
ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE
(cherry picked from commit 2eeba959fe
2023-06-15 13:02:41 -07:00
Tim Wojtulewicz
97ac6471b7
Update docs submodule [nomail] [skip ci]
2023-06-15 12:31:41 -07:00
Tim Wojtulewicz
00c0f2a7cf
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' into release/6.0
...
* origin/topic/bbannier/bump-spicy:
Bump Spicy to latest release.
2023-06-14 10:23:35 -07:00
Tim Wojtulewicz
646468c89a
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' into release/6.0
...
* origin/topic/bbannier/bump-spicy:
Bump `auxil/spicy`.
2023-06-14 09:27:13 -07:00
Benjamin Bannier
d94ca50d0b
Bump Spicy to latest release.
2023-06-14 13:33:30 +02:00
Tim Wojtulewicz
17a7cfe005
Updating CHANGES and VERSION.
2023-06-12 15:55:19 -07:00
Tim Wojtulewicz
c82b42c8dd
Update docs submodule for 6.0-rc2 [nomail] [skip ci]
2023-06-12 15:45:49 -07:00
Tim Wojtulewicz
37db4a0412
Update broker submodule [nomail]
2023-06-12 14:25:34 -07:00
Tim Wojtulewicz
d8a56ee8b4
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump `auxil/spicy`.
Update link to slack in README.md
Updating CHANGES and VERSION.
(cherry picked from commit 27575df917
2023-06-12 11:23:42 -07:00
Tim Wojtulewicz
d2b534e6b2
Merge remote-tracking branch 'origin/topic/awelzel/cluster-at-if-removal'
...
* origin/topic/awelzel/cluster-at-if-removal:
test-all-policy: Do not load nodes-experimental/manager.zeek
cluster/main: Remove extra @if ( Cluster::is_enabled() )
(cherry picked from commit 98e44ee14f
2023-06-12 11:23:01 -07:00
Tim Wojtulewicz
b34e70e6cd
Merge remote-tracking branch 'origin/topic/awelzel/3099-fix-and-extend-socks5-sig'
...
* origin/topic/awelzel/3099-fix-and-extend-socks5-sig:
socks/dpd: Add newer auth methods
socks/dpd: Fix socks5_server side signature
(cherry picked from commit c389d9804b
2023-06-12 11:01:14 -07:00
Arne Welzel
e41a5c3a93
ci/windows: choco --localonly is gone
...
choco 2.0 is now used after some caching changes on the Cirrus side [1]
and the --localonly flag is gone from choco [2], remove its usage.
[1] https://github.com/cirruslabs/cirrus-ci-docs/issues/1174#issuecomment-1580928673
[2] https://docs.chocolatey.org/en-us/guides/upgrading-to-chocolatey-v2-v6#the-list-command-now-lists-local-packages-only-and-the-local-only-and-lo-options-have-been-removed
(cherry picked from commit 528e27e542
2023-06-09 13:44:11 +02:00
Benjamin Bannier
bef857e68c
Bump auxil/spicy.
2023-06-09 12:51:16 +02:00
Tim Wojtulewicz
0f017ac45b
Update link to slack in README.md
2023-06-05 14:18:38 +02:00
Tim Wojtulewicz
037bceaf1b
Updating CHANGES and VERSION.
2023-05-31 13:42:35 +02:00
