Tim Wojtulewicz
8054547712
Merge remote-tracking branch 'origin/topic/timw/no-islower-before-toupper'
...
* origin/topic/timw/no-islower-before-toupper:
Statically lookup field offsets for connection values in UDP and ICMP analyzers
Skip calling islower before toupper
2025-04-23 12:15:03 -07:00
Arne Welzel
c27d74b2f9
Merge remote-tracking branch 'origin/topic/awelzel/copying-3rdparty-update'
...
* origin/topic/awelzel/copying-3rdparty-update:
COPYING-3rdparty: Add some missing submodules [skip ci]
2025-04-23 17:18:40 +02:00
Tim Wojtulewicz
ef943a29ec
Merge remote-tracking branch 'origin/topic/neverlord/broker-store-crash'
...
* origin/topic/neverlord/broker-store-crash:
Fix crash related to Broker stores
2025-04-23 08:08:11 -07:00
Arne Welzel
68bc6111ed
Merge remote-tracking branch 'origin/topic/awelzel/fix-listen-websocket-ubsan-port-count-confusion'
...
* origin/topic/awelzel/fix-listen-websocket-ubsan-port-count-confusion:
cluster/cluster.bif: Fix CountVal casted to PortVal
2025-04-23 15:55:59 +02:00
Arne Welzel
2b7b42e4df
Merge remote-tracking branch 'origin/topic/awelzel/no-more-ubuntu-20.04'
...
* origin/topic/awelzel/no-more-ubuntu-20.04:
CI: No more Ubuntu 20.04 [skip ci]
2025-04-23 15:08:06 +02:00
Arne Welzel
3b80630996
Merge remote-tracking branch 'origin/topic/awelzel/cluster-broker-hub-websocket-support'
...
* origin/topic/awelzel/cluster-broker-hub-websocket-support: (24 commits)
Add NEWS entry for WebSocket functionality
btest/cluster: Add broker logging test for sanity
broker/WebSocketShim: Add tests for endpoint, hubs and subscribers
broker: Deprecate NodeID(), use SetNodeId()
cluster/Backend: Do not inline Init()
cluster: Add Backend::SetNodeId()
cluster/websocket: Make websocket dispatcher queue size configurable
cluster/zeromq: Attempt publish during termination
broker/main: Reference Cluster::publish() for auto_publish() deprecation
broker/main: Deprecate Broker::listen_websocket()
cluster/websocket: Remove comment about broker
btest/cluster/websocket: Add tests using broker
btest/cluster/websocket: Move ZeroMQ test and use wstest.py
btest/files: Introduce wstest.py
cluster/websocket: Special case broker backend for shim usage
broker: Add WebSocketShim backend
broker/Manager: Add MakeHub() and ReleaseHub()
Bump broker submodule
cluster/Backend: Add ProcessError()
cluster/Backend: Rename EnqueueLocalEvent() to ProcessLocalEvent()
...
2025-04-23 14:29:33 +02:00
Tim Wojtulewicz
b8587c4fa9
Merge remote-tracking branch 'origin/topic/timw/upgrade-cares-to-1.34.5'
...
* origin/topic/timw/upgrade-cares-to-1.34.5:
Update c-ares to v1.34.5 and vcpkg to a version that includes it
2025-04-22 08:44:37 -07:00
Christian Kreibich
ed161692dd
Merge branch 'topic/christian/gh4318-track-broker-peerings'
...
* topic/christian/gh4318-track-broker-peerings:
Use Broker peering directionality when re-peering after backpressure overflows
Expand Broker APIs to allow tracking directionality of peering establishment
2025-04-21 17:21:03 -07:00
Tim Wojtulewicz
953c039603
Merge remote-tracking branch 'origin/topic/timw/test-cmake-krb5-fixes'
...
* origin/topic/timw/test-cmake-krb5-fixes:
Use longer path when including krb5.h to match the cmake lookup
Update cmake submodule for krb5 fixes [nomail]
2025-04-18 11:36:26 -07:00
Tim Wojtulewicz
b808967d1f
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-04-17 17:48:53 -07:00
Tim Wojtulewicz
89d22f6133
Merge branch 'topic/timw/clang-tidy-iwyu-for-all-targets'
...
* topic/timw/clang-tidy-iwyu-for-all-targets:
Update src/3rdparty submodule to disable clang-format
Disable linting for files generated by bison
Make sure clang-tidy and iwyu are added to all targets
2025-04-17 09:29:11 -07:00
Tim Wojtulewicz
ce7ef3ce6a
Merge remote-tracking branch 'origin/topic/timw/include-zeekjs-in-docs-by-default'
...
* origin/topic/timw/include-zeekjs-in-docs-by-default:
Add libnode-dev to docs github runner, update docs to include ZeekJS
2025-04-17 08:59:41 -07:00
Arne Welzel
0cb5ec735a
Merge remote-tracking branch 'origin/topic/awelzel/btest-no-bare-at-test'
...
* origin/topic/awelzel/btest-no-bare-at-test:
pre-commit: Ensure testing files have @TEST lines commented
testing/btest/*js: Comment all @TEST lines
testing/btest/*test: Comment all @TEST lines
testing/btest/*evt: Comment all @TEST lines
testing/btest/*zeek: Comment all @TEST lines
2025-04-17 16:57:08 +02:00
Arne Welzel
2f0be32f5f
Merge branch 'topic/jgras/shutdown-session-clear' of https://github.com/J-Gras/zeek
...
* 'topic/jgras/shutdown-session-clear' of https://github.com/J-Gras/zeek :
Remove finish_run()
Deprecate session manager's Done()
Clear sessions when session manager is done
2025-04-17 15:20:42 +02:00
Tim Wojtulewicz
9dc57225c8
Merge remote-tracking branch 'origin/topic/bbannier/ixwebsocket-warnings'
...
* origin/topic/bbannier/ixwebsocket-warnings:
Suppress warnings from compilation of external ixwebsocket dependency
2025-04-16 15:41:05 -07:00
Arne Welzel
a2a535d0c9
Merge remote-tracking branch 'origin/topic/awelzel/4275-ldap-gss-spnego-auth-miss'
...
* origin/topic/awelzel/4275-ldap-gss-spnego-auth-miss:
ldap: Clean up from code review
ldap: Add Sicily Authentication constants
ldap: Only switch into MS_KRB5 mode if responseToken exists
2025-04-16 09:40:05 +02:00
Arne Welzel
ee5ebc1b2a
Merge remote-tracking branch 'origin/topic/awelzel/bump-websocket-ixwewbsocket'
...
* origin/topic/awelzel/bump-websocket-ixwewbsocket:
IXWebSocket: Bump to latest upstream master
2025-04-15 18:31:55 +02:00
Tim Wojtulewicz
4472d600e5
Merge remote-tracking branch 'origin/topic/timw/enable-krb5-on-not-linux'
...
* origin/topic/timw/enable-krb5-on-not-linux:
CI: Add krb5 to FreeBSD
Switch libkrb5 check to exclude only Darwin
2025-04-15 08:58:06 -07:00
Tim Wojtulewicz
6ecb8f0f5f
Merge remote-tracking branch 'origin/topic/timw/storage-serialization'
...
* origin/topic/timw/storage-serialization:
Add STORAGE_ prefixes for backends and serializers
Add versioning to JSON serializer
Remove unnecessary includes in Val.h
Move byte_buffer types from cluster and storage into util
Remove unnecessary <array> and <memory> includes from util.h
Mark storage classes as final where appropriate
Add JSON storage serializer, use with existing backends/tests
Make ValFromJSON return zeek::expected instead of a variant
Ground work for pluggable storage serializers
2025-04-14 10:12:29 -07:00
Arne Welzel
faac36f4cd
Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-17-0'
...
* origin/topic/awelzel/bump-zeekjs-0-17-0:
Bump zeekjs to v0.17.0
2025-04-14 18:59:13 +02:00
Arne Welzel
c2e039f14d
Merge remote-tracking branch 'origin/topic/awelzel/generic-metadata-pre-work'
...
* origin/topic/awelzel/generic-metadata-pre-work:
cluster/Backend: Add name and lookup component tag
cluster/Event: Hide members behind accessors
cluster/PublishEvent:: Make event non-const
broker/Manager: Re-use broker serializer for conversion
EventMgr: Add Dispatch() with handler and args
plugin/Manager: Fix MetaHookPre and MetaHookPost using HOOK_CALL_FUNCTION
2025-04-13 17:16:46 +02:00
Arne Welzel
f1ae944c9c
Merge branch 'topic/jgras/fix-future-event-ts' of https://github.com/J-Gras/zeek
...
* 'topic/jgras/fix-future-event-ts' of https://github.com/J-Gras/zeek :
Prevent event timestamps set to future
2025-04-11 15:17:11 +02:00
Robin Sommer
75b3bca7de
Bump Spicy.
2025-04-11 13:00:30 +02:00
Arne Welzel
3b478ddc0a
Merge remote-tracking branch 'origin/topic/awelzel/make-files-x509-files-test-deterministic'
...
* origin/topic/awelzel/make-files-x509-files-test-deterministic:
btest/files/x509/files: Sort analyzers in baseline
2025-04-10 15:47:52 +02:00
Tim Wojtulewicz
f74f5d2734
Merge remote-tracking branch 'origin/topic/timw/revert-unreachable'
...
* origin/topic/timw/revert-unreachable:
Revert addition of std::unreachable
2025-04-09 11:12:05 -07:00
Arne Welzel
c0f2ba468d
Merge remote-tracking branch 'origin/topic/awelzel/4312-paper-over-flakiness-through-sleep'
...
* origin/topic/awelzel/4312-paper-over-flakiness-through-sleep:
btest/brokerstore-attr-persistence-clone: Add BTEST_BG_RUN_SLEEP=1
2025-04-09 18:11:42 +02:00
Tim Wojtulewicz
f3568d148f
Merge branch 'topic/timw/coverity-fixes'
...
* topic/timw/coverity-fixes:
Add move assignment operator to ZeekString, which already had a move constructor
Don't initialize telemetry listener at all if ZEEKCTL_CHECK_CONFIG is set
Avoid extra temporary strings in concatenation
Use const auto references to avoid some copies
Clean up initialization of TunnelEncapsulation to use default member values
Remove some unnecessary std::move calls in broker::Manager
Avoid divide-by-zero in CardinalityCounter::Size
Minor fixes in POP3 analyzer based on flycheck warnings
More std::move changes based on Coverity findings
Fix a potential memory leak in Debug function
2025-04-08 11:31:10 -07:00
Tim Wojtulewicz
718dc19345
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump pre-commit hooks
Bump auxil/spicy to latest development snapshot
2025-04-08 11:00:56 -07:00
Tim Wojtulewicz
290c813373
Updating CHANGES and VERSION.
2025-04-08 11:00:38 -07:00
Arne Welzel
94b1ce8c15
Merge remote-tracking branch 'origin/topic/awelzel/set-val-on-ids-for-enums'
...
* origin/topic/awelzel/set-val-on-ids-for-enums:
broker/main: Adapt enum values to agree with comm.bif
btest/plugin: Add plugin testing enum identifiers
Var/add_type: Do not clone EnumType when declared for the first time
type/id/zeekygen: Add EnumVal to enum identifiers
2025-04-04 18:37:06 +02:00
Arne Welzel
f0ccd5c7f8
Merge remote-tracking branch 'origin/topic/awelzel/4323-traverse-all-stmt-nil-fix'
...
* origin/topic/awelzel/4323-traverse-all-stmt-nil-fix:
Traverse: Do not short-circuit traverse_all() if stmts is nullptr
2025-04-03 13:11:30 +02:00
Johanna Amann
37be65dfd0
Merge remote-tracking branch 'origin/topic/johanna/remove-bind-library-check'
...
* origin/topic/johanna/remove-bind-library-check:
Remove unnecessary check for bind library.
Closes GH-432t log9
2025-04-03 10:53:21 +01:00
Tim Wojtulewicz
8d71420d09
Merge remote-tracking branch 'origin/topic/timw/enum-val-lookup-speedup'
...
* origin/topic/timw/enum-val-lookup-speedup:
Some minor c++ modernization in EnumType methods
Avoid O(n) search in EnumType::Lookup
2025-04-02 16:36:08 -07:00
Robin Sommer
28fd2a7a7a
Merge remote-tracking branch 'origin/topic/robin/spicy-typeinfo-switch'
...
* origin/topic/robin/spicy-typeinfo-switch:
Spicy: Rework code for converting Spicy values to Zeek values.
2025-04-02 18:50:09 +02:00
Robin Sommer
af46322152
Merge remote-tracking branch 'origin/topic/robin/new-tuple'
...
* origin/topic/robin/new-tuple:
Spicy: Port over to Spicy's new tuple representation.
2025-04-02 14:53:26 +02:00
Tim Wojtulewicz
b1cd502a96
Merge remote-tracking branch 'origin/topic/timw/add-ignore-docs-annotation'
...
* origin/topic/timw/add-ignore-docs-annotation:
Add comment annotation to disable copying redef value into docs
2025-04-01 12:58:31 -07:00
Arne Welzel
363fbd9e28
Merge remote-tracking branch 'origin/topic/awelzel/fix-canon-name-builtin-plugins'
...
* origin/topic/awelzel/fix-canon-name-builtin-plugins:
CI: Upgrade zeekctl task to Debian 12
Bump cmake submodule
CI: Add external plugins to builtin plugins task
2025-03-31 18:59:47 +02:00
Arne Welzel
14697ea6ba
Merge remote-tracking branch 'origin/topic/neverlord/broker-logging'
...
* origin/topic/neverlord/broker-logging:
Integrate review feedback
Hook into Broker logs via its new API
2025-03-31 18:53:43 +02:00
Christian Kreibich
f068f0da4f
Merge branch 'topic/christian/quic-history-u'
...
* topic/christian/quic-history-u:
Add "U" to QUIC history docstrings and expand version string docs
2025-03-31 09:37:19 -07:00
Benjamin Bannier
06e41cec3a
Merge remote-tracking branch 'origin/topic/bbannier/warning-arg-counting'
2025-03-31 15:08:18 +02:00
Arne Welzel
4f8a6a1dfc
Merge remote-tracking branch 'origin/topic/awelzel/4177-4178-custom-event-metadata-prework'
...
* origin/topic/awelzel/4177-4178-custom-event-metadata-prework:
Event/EventMgr: protected to private
EventHandler: Deprecate Call(args, no_remote, ts), add Call(args)
EventHandler: Header cleanup
EventMgr: Do not cache current event attributes
EventMgr: Drop src_val
Event: Header cleanup
2025-03-31 14:22:17 +02:00
Tim Wojtulewicz
edbe8f0831
Merge remote-tracking branch 'origin/topic/timw/pass-tags-for-storage-events'
...
* origin/topic/timw/pass-tags-for-storage-events:
Make storage events take a tag for the backend instead of a string
Add move constructor to Tag class
2025-03-27 16:12:53 -07:00
Tim Wojtulewicz
ed47eedd6a
Merge remote-tracking branch 'origin/topic/timw/storage-timeout-testing'
...
* origin/topic/timw/storage-timeout-testing:
Fix handling of timeout conditions from storage backends
Reformat plugin.storage btest to be more consistent with other storage tests
2025-03-27 14:10:39 -07:00
Christian Kreibich
656e88eaa8
Merge branch 'topic/christian/unexperimental-quic-histories'
...
* topic/christian/unexperimental-quic-histories:
Remove "experimental" from the QUIC history field's comment string [skip ci]
2025-03-27 12:41:03 -07:00
Arne Welzel
acab4236e2
Merge remote-tracking branch 'origin/topic/awelzel/zeromq-no-fprintf-at-overload'
...
* origin/topic/awelzel/zeromq-no-fprintf-at-overload:
cluster/zeromq: Improve XPUB stall behavior, add a metric
2025-03-26 14:24:02 +01:00
Arne Welzel
cd9b37e4a5
Merge remote-tracking branch 'origin/topic/awelzel/4309-telemetry-collect-calbacks'
...
* origin/topic/awelzel/4309-telemetry-collect-calbacks:
telemetry: Run callbacks at collect time
2025-03-26 14:08:40 +01:00
Arne Welzel
33d7e5a7bf
Merge remote-tracking branch 'origin/topic/awelzel/zeromq-unsubscription-visibility'
...
* origin/topic/awelzel/zeromq-unsubscription-visibility:
cluster/OnLoop: Add metric for queue stalling instead of fprintf
btest/cluster/websocket: ZeroMQ backend test
cluster/OnLoop: Switch to condition variable
cluster/zeromq: Fix node_topic() and nodeid_topic()
cluster/websocket: Fix null deref at WebSocket server shutdown
btest/cluster/websocket: Harden multi-client tests
cluster/zeromq: Fix unsubscription visibility
2025-03-24 19:46:20 +01:00
Tim Wojtulewicz
bc38dbcc99
Merge remote-tracking branch 'origin/topic/timw/storage-framework-followup'
...
* origin/topic/timw/storage-framework-followup:
Redis: Handle other errors from requests, fix KEY_EXISTS for put operations
SQLite: handle existing keys when overwrite=F correctly
Remove unnecessary type aliases from storage btests
Avoid thread-leak in scripts.base.frameworks.file-analysis.bifs.enable-disable btest
Fix data-race with calling DBG_LOG from a separate thread
Fix data-race with ReturnCode objects in Sqlite::DoExpire
Fix data race with calling run_state::network_time from a separate thread
Add NEWS entry for Storage, reduce CHANGES spam
Fix Coverity findings in the SQLite backend
Remove inclusion of non-existent expected-lite path during dynamic plugin builds
Squash code from OperationResultCallback into ResultCallback
Add hiredis to generate-docs workflow to enable Redis backend
2025-03-21 11:57:17 -07:00
Tim Wojtulewicz
458bf762f1
Add NEWS entry for Storage, reduce CHANGES spam
2025-03-21 11:56:27 -07:00
Arne Welzel
0a6429d447
Merge remote-tracking branch 'origin/topic/awelzel/btest-bg-run-sleep-0'
...
* origin/topic/awelzel/btest-bg-run-sleep-0:
testing/btest: Remove btest-bg-run sleep 1
2025-03-21 09:45:15 +01:00