Arne Welzel
8f60d37ad0
Merge remote-tracking branch 'origin/topic/awelzel/4440-websocket-pong-timeout'
...
* origin/topic/awelzel/4440-websocket-pong-timeout:
btest/cluster/websocket: Update tests for new event signature
cluster/websocket: Propagate code and reason to websocket_client_lost()
cluster/websocket: Support configurable ping interval
IXWebSocket: Bump to improve O^2 rxbuf erase()
2025-05-13 18:58:54 +02:00
Tim Wojtulewicz
912356deac
Merge remote-tracking branch 'origin/topic/bbannier/fix-spicy-main'
...
* origin/topic/bbannier/fix-spicy-main:
Fix clang-tidy `bugprone-inc-dec-in-conditions` report in Spicy plugins glue compiler
Fix clang-tidy `performance-enum-size` reports in Spicy plugin's glue compiler
Remove unneeded copies in Spicy plugin glue compiler
Adjust for renamed function flavor in Spicy development version
2025-05-12 11:33:54 -07:00
Arne Welzel
6b6c3dbbb7
Merge remote-tracking branch 'origin/topic/justin/file_analysis_speedup'
...
* origin/topic/justin/file_analysis_speedup:
speed up file analysis, remove IncrementByteCount
2025-05-09 17:25:55 +02:00
Arne Welzel
20ada619c5
Updating submodules binpac, broker and zeek-aux [nomail]
2025-05-09 09:52:20 +02:00
Tim Wojtulewicz
957098af1c
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-05-08 15:14:37 -07:00
Christian Kreibich
8d79429555
Merge branch 'topic/christian/fix-broker-peering-overflows-metric'
...
* topic/christian/fix-broker-peering-overflows-metric:
Bugfix: accurately track Broker buffer overflows w/ multiple peerings
2025-05-08 15:07:39 -07:00
Tim Wojtulewicz
2c17c85f55
Merge branch 'topic/timw/switch-broker-error-to-error'
...
* topic/timw/switch-broker-error-to-error:
Downgrade broker clone FatalError to an Error
2025-05-08 13:47:06 -07:00
Arne Welzel
7583651bec
Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-42'
...
* origin/topic/awelzel/ci-fedora-42:
probabilistic/BitVector: Add include <cstdint>
Bump spicy to fix build with GCC 15.1
CI: Drop fedora-40
CI: Add fedora-42
2025-05-08 13:19:30 +02:00
Arne Welzel
60efc7741d
Merge branch 'gcc15' of https://github.com/i2z1/zeek
...
* 'gcc15' of https://github.com/i2z1/zeek :
Include cstdint header to support uint8_t/uint64_t in GCC 15+
2025-05-08 09:25:28 +02:00
Tim Wojtulewicz
1dfbd33929
Merge remote-tracking branch 'origin/topic/timw/storage-timeout-option'
...
* origin/topic/timw/storage-timeout-option:
Move options to redis backend options instead of module-level options
Add operation_timeout and command_timeout storage backend options
2025-05-07 15:39:35 -07:00
Tim Wojtulewicz
507974a1d8
Merge remote-tracking branch 'origin/topic/christian/news-fix'
...
* origin/topic/christian/news-fix:
Fix Broker metrics naming bugs that snuck in w/ last-minute renaming [skip ci]
2025-05-07 14:09:52 -07:00
Tim Wojtulewicz
6f8924596f
Merge remote-tracking branch 'origin/topic/johanna/fix-failed-service-logging'
...
* origin/topic/johanna/fix-failed-service-logging:
Fix policy/protocols/conn/failed-service-logging.zeek
2025-05-07 10:29:54 -07:00
Arne Welzel
8089f5bed4
Merge remote-tracking branch 'origin/topic/awelzel/more-terminate-while-queueing-hardening'
...
* origin/topic/awelzel/more-terminate-while-queueing-hardening:
btest/cluster/generic/publish-any: Apply Christian's fix from broker/publish-any
wstest/terminate-while-queueing: Patch close_socket()
2025-05-07 17:24:04 +02:00
Tim Wojtulewicz
d7b31f5b44
Merge remote-tracking branch 'origin/topic/timw/storage-is-connected-bif'
...
* origin/topic/timw/storage-is-connected-bif:
Add Storage::is_connected BIF
Move cast_handle from storage-async.bif to BackendHandleVal static method
2025-05-07 08:16:59 -07:00
Arne Welzel
135acc7c6d
Merge remote-tracking branch 'origin/topic/awelzel/fix-flaky-terminate-while-queueing'
...
* origin/topic/awelzel/fix-flaky-terminate-while-queueing:
cluster/websocket: Stop and wait for reply thread during Terminate()
2025-05-07 13:22:13 +02:00
Arne Welzel
3be7a9ce91
Merge remote-tracking branch 'origin/topic/awelzel/double-commented-btest-lines'
...
* origin/topic/awelzel/double-commented-btest-lines:
testing/btest: Fix double commented @TEST- lines
2025-05-06 14:21:03 +02:00
Arne Welzel
4afb0ffeeb
Merge remote-tracking branch 'origin/topic/awelzel/4420-simeon-breaking-websockets'
...
* origin/topic/awelzel/4420-simeon-breaking-websockets:
Websocket: Close onloop during Terminate()
OnLoop: notify_all() instead of notify_one()
2025-05-06 14:20:38 +02:00
Tim Wojtulewicz
0393e4b84a
Merge remote-tracking branch 'XueSongTap/master'
...
* XueSongTap/master:
Add baseline for find_first test, update comments, and reorder function imports
Add find_first string function
2025-05-05 13:40:40 -07:00
Tim Wojtulewicz
f9aa9a430d
Merge remote-tracking branch 'origin/topic/timw/storage-check-redis-server-version'
...
* origin/topic/timw/storage-check-redis-server-version:
Add commands to the static methods for the Redis implementation
Redis: Check server version when connecting
2025-05-05 11:12:09 -07:00
Tim Wojtulewicz
58d71d2fa3
Merge remote-tracking branch 'origin/topic/timw/storage-redis-expire-string-view'
...
* origin/topic/timw/storage-redis-expire-string-view:
Use std::string_view in Redis::DoExpire to avoid copies
2025-05-05 10:44:51 -07:00
Arne Welzel
50ac8d1468
Merge remote-tracking branch 'origin/topic/awelzel/4405-quic-fragmented-crypto'
...
* origin/topic/awelzel/4405-quic-fragmented-crypto:
Bump external/zeek-testing
QUIC: Extract reset_crypto() function
QUIC: Rename ConnectionIDInfo to Context
QUIC: Switch initial_destination_conn_id to optional
QUIC: Use initial destination conn_id for decryption
QUIC: Handle CRYPTO frames across multiple INITIAL packets
QUIC: Do not consume EncryptedLongPacketPayload
QUIC: Fix ACK frame parsing
2025-05-05 14:40:59 +02:00
Arne Welzel
d655c64e0b
Merge remote-tracking branch 'origin/topic/awelzel/event-publish-hook'
...
* origin/topic/awelzel/event-publish-hook:
NEWS: Add HookPublishEvent() note
btest/plugin: Test for PublishEventHook()
broker and cluster: Wire up HookPublishEvent
plugin: Add HookPublishEvent hook
2025-04-30 17:57:46 +02:00
Arne Welzel
f8b75426ee
Merge remote-tracking branch 'origin/topic/awelzel/bif-tracking-no-zeromq'
...
* origin/topic/awelzel/bif-tracking-no-zeromq:
ZAM-bif-tracking: Remove ZeroMQ dependency
2025-04-30 17:23:22 +02:00
Tim Wojtulewicz
e56de061f9
Merge remote-tracking branch 'origin/topic/vern/zam-inlining-temps'
...
* origin/topic/vern/zam-inlining-temps:
fixed incorrect ZAM optimization of expressions seen in single-statement inlined functions
2025-04-29 17:50:39 -07:00
Tim Wojtulewicz
2cf8497bf7
Merge remote-tracking branch 'origin/topic/timw/update-ct-ca-lists'
...
* origin/topic/timw/update-ct-ca-lists:
External tests: add removed logs to CT list to prevent baseline changes
Update Mozilla CA list and CT list to NSS 3.110
2025-04-29 08:53:04 -07:00
Arne Welzel
d5e1dc27c6
Merge branch 'topic/mohan/intel-event-groups' of https://github.com/Mohan-Dhawan/zeek
...
* 'topic/mohan/intel-event-groups' of https://github.com/Mohan-Dhawan/zeek :
coalesce smtp handlers for ADDR
Add fine-grained groups for Intel events
2025-04-29 15:00:58 +02:00
Arne Welzel
5bf660a9ce
Merge remote-tracking branch 'origin/topic/awelzel/cluster-coverity-fixes'
...
* origin/topic/awelzel/cluster-coverity-fixes:
broker/WebSocketShim: Check RegisterFd() return
cluster/OnLoop: Fix coverity report about proc accessed without lock
2025-04-28 19:41:10 +02:00
Arne Welzel
540baa89af
Merge remote-tracking branch 'origin/topic/awelzel/3045-no-holes-in-vectors'
...
* origin/topic/awelzel/3045-no-holes-in-vectors:
broker/Data/data_to_val: Fail on vectors/lists with holes
2025-04-28 18:24:25 +02:00
Tim Wojtulewicz
b9b268bd86
Merge remote-tracking branch 'origin/topic/timw/use-after-move'
...
* origin/topic/timw/use-after-move:
Fix use-after-move in recent broker changes
2025-04-25 16:11:56 -07:00
Tim Wojtulewicz
82bf555f7d
Merge branch 'topic/timw/4218-lowercase-http'
...
* topic/timw/4218-lowercase-http:
Ignore case when matching prefix in http analyzer
2025-04-25 10:33:39 -07:00
Tim Wojtulewicz
4f65b89edf
Merge remote-tracking branch 'origin/topic/timw/seven-two-news'
...
* origin/topic/timw/seven-two-news:
Updates for the various Broker changes
Add versions of bundled dependencies
Fix a few typos.
Additional user contributions for NEWS
NEWS addition for cluster backends
NEWS additions for 7.2
Reformat 7.2 NEWS entries for consistent line lengths
2025-04-25 10:25:12 -07:00
Christian Kreibich
ebd0207352
Merge branch 'topic/christian/broker-tuning'
...
* topic/christian/broker-tuning:
Lower listen/connect retry intervals in Broker and the cluster framework to 1sec
Bump cluster testsuite
Switch Broker's default backpressure policy to drop_oldest, bump buffer sizes
Deprecate Broker::congestion_queue_size and stop using it internally
2025-04-25 10:23:55 -07:00
Christian Kreibich
c1a5f70df8
Merge branch 'topic/christian/broker-backpressure-metrics'
...
* topic/christian/broker-backpressure-metrics:
Add basic btest to verify that Broker peering telemetry is available.
Add cluster framework telemetry for Broker's send-buffer use
Add peer buffer update tracking to the Broker manager's event_observer
Rename the Broker manager's LoggerAdapter
Avoid race in the cluster/broker/publish-any btest
2025-04-25 10:04:09 -07:00
Tim Wojtulewicz
6f52bdd29a
Merge remote-tracking branch 'origin/topic/timw/clang-tidy-highway-hash'
...
* origin/topic/timw/clang-tidy-highway-hash:
Skip linting on highwayhash and src/3rdparty files
2025-04-25 06:41:16 -07:00
Tim Wojtulewicz
c4613cf573
Merge remote-tracking branch 'origin/topic/timw/storage-framework-script-docs-updates'
...
* origin/topic/timw/storage-framework-script-docs-updates:
Minor changes to storage framework script docs
2025-04-25 06:40:54 -07:00
Evan Typanski
154ee7720e
Merge remote-tracking branch 'origin/topic/etyp/spicy-bump'
...
* origin/topic/etyp/spicy-bump:
Bump Spicy
2025-04-25 08:41:02 -04:00
Arne Welzel
a852ecf913
Merge remote-tracking branch 'origin/topic/awelzel/backend-ready-callback-logic'
...
* origin/topic/awelzel/backend-ready-callback-logic:
btest/cluster/websocket: Move no-subscriptions test
cluster/websocket: Leverage ReadyToPublishCallback()
cluster/zeromq: Implement DoReadyToPublishCallback()
cluster/Backend: Add ReadyToPublishCallback() API
2025-04-25 10:06:36 +00:00
Arne Welzel
b0ecc131d0
Merge remote-tracking branch 'origin/topic/awelzel/comment-out-broker-websocket-shim-two-endpoint-tests'
...
* origin/topic/awelzel/comment-out-broker-websocket-shim-two-endpoint-tests:
broker/WebSocketShim/tests: Comment out two endpoint tests
broker/WebSocketShim/tests: Replace hard-coded timeout values with vars
2025-04-25 09:03:14 +02:00
Arne Welzel
69a1ad2c3d
Merge remote-tracking branch 'origin/topic/awelzel/cluster-fix-tsan-zeromq-do-terminate'
...
* origin/topic/awelzel/cluster-fix-tsan-zeromq-do-terminate:
NEWS: Add entry about WebSocket client events
btest/cluster: Testing cleanup
cluster/websocket: Raise websocket_client_lost() after terminate
cluster/ThreadedBackend: Invoke onloop->Process() during DoTerminate()
cluster/ThreadedBackend: Remove Process()
zeromq: Call super class DoTerminate() after stopping thread
2025-04-24 14:04:11 +02:00
Arne Welzel
79c4fdb237
Merge remote-tracking branch 'origin/topic/awelzel/websocket-empty-subscriptions'
...
* origin/topic/awelzel/websocket-empty-subscriptions:
cluster/websocket: Short-circuit clients without subscriptions
cluster/websocket: Factor out active subscription handling
2025-04-24 08:17:46 +02:00
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