Arne Welzel
b1157e4e03
Merge remote-tracking branch 'origin/topic/bbannier/issue-4594'
...
* origin/topic/bbannier/issue-4594:
Align WebSocket error in cluster with one in Broker
2025-06-22 15:49:23 +02:00
Arne Welzel
b0a26eddaa
Merge remote-tracking branch 'origin/topic/awelzel/4571-reject-cluster-event-broker-publish'
...
* origin/topic/awelzel/4571-reject-cluster-event-broker-publish:
broker: Handle Broker::publish() with non Broker::Event
2025-06-22 15:48:36 +02:00
Johanna Amann
a22837536d
Merge remote-tracking branch 'origin/topic/johanna/gh-4521'
...
* origin/topic/johanna/gh-4521:
Change x509 not_before/not_after to not be based on local timezone
2025-06-18 13:27:57 +01:00
Benjamin Bannier
2866934792
Merge branch 'topic/bbannier/spicy-ssl-refs'
2025-06-18 13:14:13 +02:00
Arne Welzel
19f2621f7b
Merge remote-tracking branch 'origin/topic/awelzel/4573-remove-is-packet-source'
...
* origin/topic/awelzel/4573-remove-is-packet-source:
IOSource: Remove IsPacketSource
2025-06-17 09:25:39 +02:00
Arne Welzel
f4357485d2
Merge remote-tracking branch 'origin/topic/awelzel/4562-post-proc-lookup-failure'
...
* origin/topic/awelzel/4562-post-proc-lookup-failure:
btest/logging: Fly-by cleanup
logging/Ascii: Fix abort() for non-existing postrotation functions
2025-06-16 14:58:49 +02:00
Arne Welzel
99155f6ec6
Merge remote-tracking branch 'origin/topic/awelzel/add-ws-tls-nocert-btest'
...
* origin/topic/awelzel/add-ws-tls-nocert-btest:
btest/cluster/websocket: Add cert-less test
2025-06-16 13:48:08 +02:00
Tim Wojtulewicz
2b8cb515b9
Merge remote-tracking branch 'origin/topic/timw/fix-master'
...
* origin/topic/timw/fix-master:
Add missing #include to packet_analysis/Component.h
2025-06-11 13:18:43 -07:00
Tim Wojtulewicz
0a8149c185
Merge remote-tracking branch 'origin/topic/timw/util-types'
...
* origin/topic/timw/util-types:
Remove some unused #includes from spicy code
Remove using util.h in various headers in favor of util-types.h
Move type definitions/aliases from util.h to a separate file
2025-06-11 11:12:27 -07:00
Christian Kreibich
62442058e7
Merge branch 'topic/christian/enumval-string-fix'
...
* topic/christian/enumval-string-fix:
Bugfix: AsString() on an EnumVal will segfault
2025-06-11 09:01:03 -07:00
Arne Welzel
f5063bfcd4
Merge remote-tracking branch 'origin/topic/awelzel/4522-bdat-last-reply-fix'
...
* origin/topic/awelzel/4522-bdat-last-reply-fix:
smtp: Fix last_reply column in smtp.log for BDAT LAST
2025-06-11 17:25:21 +02:00
Tim Wojtulewicz
14ca808bcf
Merge remote-tracking branch 'origin/topic/timw/netbios-ssn-session-timeout-constant'
...
* origin/topic/timw/netbios-ssn-session-timeout-constant:
Move netbios_ssn_session_timeout to a script-level constant
2025-06-10 12:08:46 -07:00
Arne Welzel
61f93f9eb6
Merge remote-tracking branch 'origin/topic/awelzel/disable-zam-bif-tracking'
...
* origin/topic/awelzel/disable-zam-bif-tracking:
btest/opt/ZAM-bif-tracking: Disable by default
2025-06-10 18:50:54 +02:00
Christian Kreibich
2f8bbeab1f
Merge branch 'topic/christian/btest-trace-cleanup'
...
* topic/christian/btest-trace-cleanup:
Btests: don't use -C in Zeek invocations that don't actually need it
Remove executable file permission bits from a bunch of our pcaps
2025-06-09 18:00:44 -07:00
Tim Wojtulewicz
ac9ee9f219
Merge remote-tracking branch 'origin/topic/timw/clang-tidy-modernize-fixes'
...
* origin/topic/timw/clang-tidy-modernize-fixes:
Move initialization of RandTest members to header
Update .clang-tidy to have modernize-* enabled with some exclusions
Fix clang-tidy modernize-use-transparent-functors findings
Fix clang-tidy modernize-use-override findings
Fix clang-tidy modernize-use-nullptr findings
Fix clang-tidy modernize-use-emplace findings
Fix clang-tidy modernize-use-default-member-init findings
Fix clang-tidy modernize-use-bool-literals findings
Fix clang-tidy modernize-return-braced-init-list findings
Fix clang-tidy modernize-redundant-void-arg findings
Fix clang-tidy modernize-pass-by-value findings
Fix clang-tidy modernize-min-max-use-initializer-list findings
Fix clang-tidy modernize-make-unique findings
Fix clang-tidy modernize-loop-convert findings (LOOP_OVER_ macros)
Fix clang-tidy modernize-loop-convert findings
Update bifcl submodule with clang-tidy fixes [nomail]
2025-06-06 11:45:59 -07:00
Christian Kreibich
b95f1b0925
Merge branch 'topic/christian/zeekygen-parse-only'
...
* topic/christian/zeekygen-parse-only:
Fix a typo.
Update NEWS for Zeekygen parse-only change.
Remove adjustments and custom terminate() for Zeekygen invocation.
Suppress warnings on deprecated DPD scripts during Zeekygen
Stop suppressing stdout during Zeekygen docs generation
Make Zeekygen docs generation (-X) imply parse-only (-a)
2025-06-06 10:43:32 -07:00
Arne Welzel
2468fe2355
Merge branch 't/gh-4448' of https://github.com/AmazingPP/zeek
...
* 't/gh-4448' of https://github.com/AmazingPP/zeek :
Fix `&ordered` attribute not preserved in table initializer assignments
2025-06-06 17:35:54 +02:00
Arne Welzel
8189716adc
Merge branch 'topic/ado/final-docker' of https://github.com/edoardomich/zeek
...
* 'topic/ado/final-docker' of https://github.com/edoardomich/zeek :
docker: Add `net-tools` and `procps` dependencies
2025-06-06 10:26:45 +02:00
Tim Wojtulewicz
1ba2f62b4e
Merge remote-tracking branch 'origin/topic/timw/configure-output-follow-up'
...
* origin/topic/timw/configure-output-follow-up:
Follow-ups to configure output reformatting
2025-06-05 20:31:11 -07:00
Tim Wojtulewicz
e6492f7c7b
Merge remote-tracking branch 'origin/topic/timw/storage-expire-contention'
...
* origin/topic/timw/storage-expire-contention:
Add busy_timeout script-level option, override any busy_timeout pragma
Handle potential contention when running sqlite expiration
Add expiration to sqlite-cluster.btest
Use unique_ptr to avoid needing to call sqlite3_reset manually
Move Deferred class from ZeroMQ to util
2025-06-05 12:43:50 -07:00
Tim Wojtulewicz
a289307e50
Merge remote-tracking branch 'origin/topic/timw/clang-20-build-warnings'
...
* origin/topic/timw/clang-20-build-warnings:
Silence -Wnontrivial-memcall warning in ConnKey methods
2025-06-05 08:22:40 -07:00
Johanna Amann
e6755325e1
Merge remote-tracking branch 'origin/topic/johanna/new-style-analyzer-log'
...
* origin/topic/johanna/new-style-analyzer-log:
NEWS entries for analyzer log changes
Move detect-protocol from frameworks/dpd to frameworks/analyzer
Introduce new c$failed_analyzers field
Settle on analyzer.log for the dpd.log replacement
dpd->analyzer.log change - rename files
Analyzer failure logging: tweaks and test fixes
Introduce analyzer-failed.log, as a replacement for dpd.log
Rename analyzer.log to analyzer.debug log; move to policy
Move dpd.log to policy script
2025-06-05 07:22:35 +01:00
Tim Wojtulewicz
62dc6ce7bc
Merge remote-tracking branch 'origin/topic/timw/clang-tidy-cppcoreguidelines-fixes'
...
* origin/topic/timw/clang-tidy-cppcoreguidelines-fixes:
Add some notes about missing/disabled cppcoreguildlines clang-tidy checkers
Fix clang-tidy cppcoreguidelines-macro-usage findings (macro functions)
Fix clang-tidy cppcoreguidelines-macro-usage findings (macros as constants)
script_opt: Add missing virtual destructor (cppcoreguidelines-virtual-class-destructor)
2025-06-04 09:38:38 -07:00
Evan Typanski
14fa756d31
Merge remote-tracking branch 'origin/topic/etyp/fix-reenable-analyzer-log'
...
* origin/topic/etyp/fix-reenable-analyzer-log:
Fix Spicy re-enable builtin analyzer debug message
2025-06-04 08:40:27 -04:00
Tim Wojtulewicz
3ae9d8ba90
Merge remote-tracking branch 'origin/topic/timw/4350-redis-passwords'
...
* origin/topic/timw/4350-redis-passwords:
Redis: Add support for sending AUTH commands during connection
Redis: disconnect cleanly if INFO request fails
Fix segfault if storage sync open_backend returns bad code
Add ToStdString and ToStdStringView to ZeekString
2025-06-03 11:54:23 -07:00
Tim Wojtulewicz
f76a2437cd
Merge remote-tracking branch 'origin/topic/timw/update-windows-ci'
...
* origin/topic/timw/update-windows-ci:
Update libunistd submodule [nomail]
Update Windows CI image to Visual Studio 2022
2025-06-02 14:53:01 -07:00
Tim Wojtulewicz
237c7da47a
Merge remote-tracking branch 'origin/topic/timw/bump-opensuse-tumbleweed-docker-image'
...
* origin/topic/timw/bump-opensuse-tumbleweed-docker-image:
CI: Force rebuild of opensuse tumbleweed docker image
2025-06-02 14:31:39 -07:00
Tim Wojtulewicz
aea614be56
Merge remote-tracking branch 'origin/topic/robin/gh-4501-eod-abort'
...
* origin/topic/robin/gh-4501-eod-abort:
Bump Spicy to pull in fix.
2025-06-02 14:30:51 -07:00
Tim Wojtulewicz
d0f82d8e15
Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-17-1'
...
* origin/topic/awelzel/bump-zeekjs-0-17-1:
Bump zeekjs to v0.17.1
2025-06-02 11:45:15 -07:00
Tim Wojtulewicz
f2b6fbe1a4
Merge remote-tracking branch 'origin/topic/bbannier/comment-fix'
...
* origin/topic/bbannier/comment-fix:
Fix incorrectly copied comment [skip CI]
2025-06-02 11:44:05 -07:00
Arne Welzel
0a34b39e7a
Merge remote-tracking branch 'origin/topic/awelzel/4177-4178-custom-event-metadata-part-2'
...
* origin/topic/awelzel/4177-4178-custom-event-metadata-part-2:
Event: Bail on add_missing_remote_network_timestamp without add_network_timestamp
btest/plugin: Test custom metadata publish
NEWS: Add note about generic event metadata
cluster: Remove deprecated Event constructor
cluster: Remove some explicit timestamp handling
broker/Manager: Fetch and forward all metadata from events
Event/init-bare: Add add_missing_remote_network_timestamp logic
cluster/Backend/DoProcessEvent: Use generic metadata, not just timestamps
cluster/Event: Support moving args and metadata from event
cluster/serializer/broker: Support generic metadata
cluster/Event: Generic metadata support
Event: Use -1.0 for undefined/unset timestamps
cluster: Use shorter obj_desc versions
Desc: Add obj_desc() / obj_desc_short() overloads for IntrusivePtr
2025-06-02 17:33:22 +02:00
Arne Welzel
31f51f7a87
Merge remote-tracking branch 'origin/topic/bbannier/coverity-fixes'
...
* origin/topic/bbannier/coverity-fixes:
Prefer `std::move` over copy
2025-06-02 10:17:24 +02:00
Arne Welzel
e5bb6317fa
Merge remote-tracking branch 'origin/topic/vern/CPP-maint.May25'
...
* origin/topic/vern/CPP-maint.May25:
minor BTest maintenance updates for -O gen-C++
fix for more robustly finding BTests to assess for -O gen-C++
fix for -O gen-C++ dealing with type constants of unnamed compound types
2025-06-02 10:12:27 +02:00
Arne Welzel
41f04eda72
Merge remote-tracking branch 'origin/topic/awelzel/intel-indicator-hooks'
...
* origin/topic/awelzel/intel-indicator-hooks:
intel/seen/manage-event-groups: Policy script for toggling intel event groups
intel: Add indicator_inserted and indicator_removed hooks
2025-06-02 09:52:07 +02:00
Tim Wojtulewicz
3282bbc429
Merge remote-tracking branch 'origin/topic/vern/ZAM-maint.May25'
...
* origin/topic/vern/ZAM-maint.May25:
fix for crash when interpreting transformed ASTs that include multi-field record assignments/additions
Remove unused ZAM compiler method
2025-05-30 13:07:01 -07:00
Tim Wojtulewicz
70bc0d9deb
Merge remote-tracking branch 'origin/topic/timw/cleanup-cmake-summary-output'
...
* origin/topic/timw/cleanup-cmake-summary-output:
Add utility methods to make CMake summary output nicer
2025-05-30 12:16:35 -07:00
Tim Wojtulewicz
dc5dd8be45
Merge remote-tracking branch 'origin/topic/timw/new-ci-pr-labels'
...
* origin/topic/timw/new-ci-pr-labels:
CI: Add PR label for skipping all CI jobs
CI: Add PR label for running cluster tests
2025-05-30 10:29:37 -07:00
Tim Wojtulewicz
9c290df47f
Merge remote-tracking branch 'origin/topic/timw/ci-clang-tidy'
...
* origin/topic/timw/ci-clang-tidy:
CI: Add new task to run clang-tidy as part of nightly builds
CI: Update to clang 19 on ubuntu 24.04, add clang-tidy package
2025-05-30 08:39:36 -07:00
Arne Welzel
f4cd92e24a
Merge remote-tracking branch 'origin/topic/awelzel/4494-ts-millis-signed'
...
* origin/topic/awelzel/4494-ts-millis-signed:
logging/ascii/json: Make TS_MILLIS signed, add TS_MILLIS_UNSIGNED
2025-05-30 17:24:17 +02:00
Tim Wojtulewicz
c387ec87be
Merge remote-tracking branch 'origin/topic/timw/clang-tidy-performance-fixes'
...
* origin/topic/timw/clang-tidy-performance-fixes:
Add move operations for LogWriteHeader
Add missing setting of type in session::Key move operations
Update .clang-tidy to have performance-* enabled with some exclusions
Fix clang-tidy performance-inefficient-string-concatenation warnings
Fix clang-tidy performance-unnecessary-copy-initialization warnings
Fix clang-tidy performance-move-const-argument warnings (not move assignable/copyable)
Fix clang-tidy performance-move-const-argument warnings (passing move to const argument)
Fix clang-tidy performance-move-const-argument warnings (moving trivially copyable)
Fix clang-tidy performance-move-const-argument warnings (moving const variables)
Fix clang-tidy performance-inefficient-vector-operation warnings
Fix clang-tidy performance-for-range-copy warnings
Fix clang-tidy performance-faster-string-find warnings
Fix clang-tidy performance-enum-size warnings
Fix clang-tidy performance-avoid-endl warnings
2025-05-30 08:13:19 -07:00
Arne Welzel
10bfb34a8a
Update doc submodule [nomail] [skip ci]
...
Fix botched last-minute cleanup.
2025-05-30 16:49:10 +02:00
Arne Welzel
1d241fabf4
Merge remote-tracking branch 'origin/topic/awelzel/zeekygen-field-directive'
...
* origin/topic/awelzel/zeekygen-field-directive:
Bump doc submodule for ext/zeek.py modifications
RecordType:DescribeReST: Render RecordType using zeek:field directive
2025-05-30 16:44:42 +02:00
Arne Welzel
f16ebd34b3
Merge remote-tracking branch 'origin/topic/awelzel/4474-cluster-websocket-ipv6'
...
* origin/topic/awelzel/4474-cluster-websocket-ipv6:
IXWebsocket: Bump to version with memset() sock addr fix
cluster/websocket: Deprecate $listen_host, introduce $listen_addr
cluster/websocket-ixwebsocket: Determine proper address_family
2025-05-30 11:47:55 +02:00
Tim Wojtulewicz
2d7aad2c81
Merge remote-tracking branch 'origin/topic/timw/remove-with-bind'
...
* origin/topic/timw/remove-with-bind:
Remove obsolete --with-bind configure flag
2025-05-28 08:29:50 -07:00
Tim Wojtulewicz
88ae3ba412
Merge remote-tracking branch 'origin/topic/timw/coverity'
...
* origin/topic/timw/coverity:
Add a few std::moves to fix Coverity warnings
Fix possible memory leak in broker::Manager
fixup! Use SCN* constants when reading into sized integer types
from_json: Statically lookup err index in result type
Use SCN* constants when reading into sized integer types
Remove setting unused variable value in FTP::parse_eftp
2025-05-27 12:49:13 -07:00
Tim Wojtulewicz
aaca36dc22
Merge remote-tracking branch 'origin/topic/timw/clang-tidy-bugprone-fixes'
...
* origin/topic/timw/clang-tidy-bugprone-fixes: (22 commits)
Update .clang-tidy to have bugprone-* enabled with some exclusions
Fix clang-tidy bugprone-unused-return-value warnings
Fix clang-tidy bugprone-unsafe-functions warnings
Fix clang-tidy bugprone-unused-local-non-trivial-variable warnings
Fix clang-tidy bugprone-throw-keyword-missing warnings
Fix clang-tidy bugprone-switch-missing-default-case warnings
Fix clang-tidy bugprone-suspicious-realloc-usage warnings
Fix clang-tidy bugprone-suspicious-include warnings
Fix clang-tidy bugprone-suspicious-string-compare warnings
Fix clang-tidy bugprone-suspicious-stringview-data-usage warnings
Fix clang-tidy bugprone-string-literal-with-embedded-nul warnings
Fix clang-tidy bugprone-parent-virtual-call warnings
Fix clang-tidy bugprone-misplaced-widening-cast warnings
Fix clang-tidy bugprone-inc-dec-in-conditions warnings
Fix clang-tidy bugprone-multi-level-implicit-pointer-conversion warnings
Fix clang-tidy bugprone-macro-parentheses warnings
Fix clang-tidy bugprone-incorrect-roundings warnings
Fix clang-tidy bugprone-incorrect-division warnings
Fix clang-tidy bugprone-implicit-widening-of-multiplication-result warnings
Remove noexcept from util::tokenize_string
...
2025-05-27 11:59:46 -07:00
Johanna Amann
8ce741a7a8
Merge remote-tracking branch 'origin/topic/johanna/gh-4463'
...
* origin/topic/johanna/gh-4463:
Add explicit TLS support for FTP
2025-05-27 17:47:52 +01:00
Evan Typanski
9f2fb47f48
Merge remote-tracking branch 'origin/topic/etyp/redis-analyzer'
...
* origin/topic/etyp/redis-analyzer:
spicy-redis: Add NEWS entry
spicy-redis: Separate error replies from success
spicy-redis: Cleanup scripts and tests
spciy-redis: Bring Redis analyzer into Zeek proper
spicy-redis: Abort parsing if server data comes first
spicy-redis: Add recursion depth to server data
spicy-redis: Make client data only accept bulk strings
spicy-redis: Add dpd signature and clean pcaps
spicy-redis: Add some commands and touch up parsing
spicy-redis: Add some script logic for logging
spicy-redis: Separate client/server
spicy-redis: Touchup logging and Spicy issues
spicy-redis: Add synchronization and pipeline support
spicy-redis: Begin Spicy Redis analyzer
2025-05-27 10:20:00 -04:00
Arne Welzel
cef63e871e
Merge remote-tracking branch 'origin/topic/awelzel/fix-no-zero-timestamp-metadata'
...
* origin/topic/awelzel/fix-no-zero-timestamp-metadata:
btest: Add test for Cluster::hello zero-timestamp
EventMgr/Enqueue: Add automatic timestamp metadata to local events, only
cluster and broker: Propagate zero-timestamp as metadata, too.
2025-05-26 16:08:58 +02:00
Tim Wojtulewicz
f996f661b6
Merge remote-tracking branch 'origin/topic/timw/redis-connection-failure'
...
* origin/topic/timw/redis-connection-failure:
Redis: bump version of hiredis required
Redis: return proper error if connection fails
2025-05-23 12:13:51 -07:00