Commit graph

2347 commits

Author SHA1 Message Date
Tim Wojtulewicz
0edc331ca1 Merge remote-tracking branch 'turrisxyz/Pinned-Dependencies-GitHub'
* turrisxyz/Pinned-Dependencies-GitHub:
  chore: Set permissions for GitHub actions
2022-06-14 11:30:46 -07:00
Tim Wojtulewicz
910e3b3024 Merge remote-tracking branch 'turrisxyz/Dependabot-GitHub-Actions'
* turrisxyz/Dependabot-GitHub-Actions:
  chore: Included githubactions in the dependabot config
2022-06-14 10:07:56 -07:00
Christian Kreibich
763b0c8d10 Merge branch 'topic/christian/management-auto-assign-ports'
* topic/christian/management-auto-assign-ports:
  Management framework: bump zeek-client to pull in relaxed port handling
  Management framework: bump external cluster testsuite
  Management framework: also use send_set_configuration_response_error elsewhere
  Management framework: minor log formatting tweak, for consistency
  Management framework: support auto-assignment of ports in cluster nodes
2022-06-08 13:44:29 -07:00
Tim Wojtulewicz
31fa43b3df Merge remote-tracking branch 'origin/topic/timw/make-dist-deleting-build-files'
* origin/topic/timw/make-dist-deleting-build-files:
  Keep make dist from deleting all paths containing 'build' [skip ci]
2022-06-07 10:02:47 -07:00
Tim Wojtulewicz
5668a6a6de Remove duplicate entry about websockets from 5.0 NEWS 2022-06-06 09:39:07 -07:00
Tim Wojtulewicz
8d97d5f56a Merge remote-tracking branch 'origin/topic/vern/zam-tests-and-NEWS.Jun22'
* origin/topic/vern/zam-tests-and-NEWS.Jun22:
  NEWS updates for 5.0
  NEWS updates for 5.0
  ZAM test suite updates due to recent changes
2022-06-06 09:36:47 -07:00
Tim Wojtulewicz
733b8c4e0f Updating CHANGES and VERSION. 2022-06-06 09:36:16 -07:00
Tim Wojtulewicz
811caec77a Start of 5.1.0 development 2022-06-03 12:36:24 -07:00
Christian Kreibich
a9c10e20a2 Merge branch 'topic/christian/management-update-refs'
* topic/christian/management-update-refs:
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client to bring back to master
2022-06-03 10:56:05 -07:00
Tim Wojtulewicz
9964a46402 Fix hang in DNS analyzer with malformed packet
(cherry picked from commit dfc9f77b68f6d02d059ade322b9c132e32c26872)
2022-06-03 10:32:03 -07:00
Tim Wojtulewicz
41aa8b2349 Merge remote-tracking branch 'origin/topic/christian/is_used_in_netcontrol_sumstats'
* origin/topic/christian/is_used_in_netcontrol_sumstats:
  Additional &is_used tags in the Netcontrol and Sumstats frameworks
2022-06-03 09:50:54 -07:00
Tim Wojtulewicz
febdc97f09 Merge remote-tracking branch 'origin/topic/christian/management-instance-handling'
* origin/topic/christian/management-instance-handling:
  Management framework: bump zeek-client to pull in rendering tweaks
  Management framework: bump external cluster testsuite
  Management framework: improve address and port handling
  Management framework: broaden get_instances response data to connected instances
  Management framework: expand notify_agent_hello event arguments
  Management framework: comment-only tweaks and typo fixes
2022-06-03 09:50:21 -07:00
Tim Wojtulewicz
facdf0b0d3 Merge remote-tracking branch 'origin/topic/timw/update-submodules'
* origin/topic/timw/update-submodules:
  Updating submodule(s) [nomail]
2022-06-02 17:01:34 -07:00
Tim Wojtulewicz
535a6013aa Merge remote-tracking branch 'zeek-as-org/as-org'
* zeek-as-org/as-org:
  Mark lookup_asn() BIF as deprecated in v6.1
  Define geo_autonomous_system record type
  Add lookup_autonomous_system() BIF that returns AS number and org
2022-06-02 16:59:29 -07:00
Christian Kreibich
bef0597ac9 Merge branch 'topic/christian/gh-2152-check-for-websockets-module'
* topic/christian/gh-2152-check-for-websockets-module:
  Make broker.web-socket-events test require the Python websockets package
2022-06-02 13:16:56 -07:00
Christian Kreibich
1cebdd569d Merge branch 'topic/christian/gh-2134-fix-intel-test-races'
* topic/christian/gh-2134-fix-intel-test-races:
  Expand scripts.base.frameworks.intel.cluster-transparency test
  Fix races in scripts.base.frameworks.intel.cluster-transparency-with-proxy test
  Add Intel::send_store_on_node_up boolean to control min_data_store delivery
2022-06-02 12:20:06 -07:00
Robin Sommer
24c2090ffb
Merge remote-tracking branch 'origin/topic/robin/websocket'
* origin/topic/robin/websocket:
  Add WebSocket support for exchanging events with external clients.
2022-06-02 12:08:31 +02:00
Tim Wojtulewicz
4b0e1063ed Merge remote-tracking branch 'origin/topic/timw/update-submodules'
* origin/topic/timw/update-submodules:
  Update auxil/package-manager submodule [nomail]
  Update submodule(s) [nomail]
2022-06-01 11:10:15 -07:00
Tim Wojtulewicz
bee8b2a708 Merge remote-tracking branch 'origin/topic/timw/2136-iosource-shutdown'
* origin/topic/timw/2136-iosource-shutdown:
  GH-2136: Clean up DNS_Mgr before shutting down
2022-06-01 11:08:54 -07:00
Tim Wojtulewicz
38702053bd Merge remote-tracking branch 'origin/topic/timw/c-ares-include-path'
* origin/topic/timw/c-ares-include-path:
  GH-2101: Update cmake submodule to fix c-ares include path problem
2022-06-01 09:20:33 -07:00
Christian Kreibich
65589c9bcb Merge branch 'topic/christian/management-verify-nodestarts'
* topic/christian/management-verify-nodestarts:
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client to pull in set-config rendering
  Management framework: enable stdout/stderr reporting
  Management framework: Supervisor extensions for stdout/stderr handling
  Management framework: disambiguate redef field names in agent and controller
  Management framework: move to ResultVec in agent's set_configuration response
  Management framework: tune request timeout granularity and interval
  Management framework: verify node starts when deploying a configuration
  Management framework: a bit of debug-level logging for troubleshooting
2022-05-31 12:59:18 -07:00
Christian Kreibich
93bed5a261 Merge branch 'topic/christian/node-status-notification'
* topic/christian/node-status-notification:
  Add Supervisor::node_status notification event
2022-05-31 12:53:18 -07:00
Tim Wojtulewicz
5a07aa9a0b Merge remote-tracking branch 'origin/topic/vern/find-unused'
* origin/topic/vern/find-unused:
  Update spicy-plugin with change that checks for zeek version
  deprecation messages for unused base script functions
  clearer messages for warning about unused functions
  Fixes from review, post-rebase
  code formatting and more btest updates
  baseline & btest updates
  annotate orphan base script components with &deprecated
  annotate base scripts with &is_used as needed
  --no-usage-warnings flag to suppress analysis
  support for associating &is_used attributes with functions
  classes for evaluating function/hook/event usage
  broader support for AST traversal, including Attr and Attributes objects
  include attributes in descriptions of sets and tables
  low-level tidying
2022-05-31 11:14:22 -07:00
Tim Wojtulewicz
bdfa7e70f5 Merge remote-tracking branch 'origin/topic/timw/fix-rst-warning'
* origin/topic/timw/fix-rst-warning:
  Update zeek-aux submodule to fix a compiler warning
2022-05-27 14:34:01 -07:00
Christian Kreibich
415bbe17d6 Merge branch 'topic/christian/management-cluster-dirs'
* topic/christian/management-cluster-dirs:
  Management framework: bump zeek-client to pull in instance serialization fixes
  Management framework: bump external cluster testsuite
  Management framework: update agent-checkin test to reflect recent changes
  Management framework: place each Zeek process in its own working dir
  Management framework: set defaults for log rotation and persistent state
  Management framework: add spool and state directory config settings
  Management framework: establish stdout/stderr files also for cluster nodes
  Management framework: default to having agents check in with the (local) controller
  Management framework: move role variable from logging into framework-wide config
  Management framework: distinguish supervisor/supervisee when loading agent/controller
  Management framework: simplify agent and controller stdout/stderr files
  Management framework: prefix the management logs with "management-"
  Management framework: comment and layouting tweaks, no functional change
  Management framework: rename env var that labels agents/controllers
  Management framework: increase robustness of agent/controller naming
2022-05-26 16:10:14 -07:00
Tim Wojtulewicz
fb01c8967a Merge remote-tracking branch 'origin/topic/timw/2054-null-string-join'
* origin/topic/timw/2054-null-string-join:
  GH-2054: Allow nulls as separators for join_string_vec
2022-05-26 08:23:53 -07:00
Tim Wojtulewicz
2f453cd0cd Merge remote-tracking branch 'origin/topic/timw/1995-pcap-filter-error-messages'
* origin/topic/timw/1995-pcap-filter-error-messages:
  Propagate BPF_Program error message to script land
  Allow pcap pktsrc to use other BPF_Program::Compile method
2022-05-25 12:09:52 -07:00
Tim Wojtulewicz
515e5bf8a3 Merge remote-tracking branch 'origin/topic/bbannier/spicy-bump'
* origin/topic/bbannier/spicy-bump:
  Bump Spicy and spicy-plugin.
  Clean up test `spicy.spicyz-jit`.
2022-05-25 09:40:26 -07:00
Tim Wojtulewicz
7c56b6923b Merge remote-tracking branch 'origin/topic/timw/2125-scriptprofile-warnings'
* origin/topic/timw/2125-scriptprofile-warnings:
  GH-2125: Fix compiler warnings in ScriptProfile
2022-05-25 09:38:30 -07:00
Tim Wojtulewicz
97e8f9d268 Merge remote-tracking branch 'origin/topic/timw/dict-debug-fixes'
* origin/topic/timw/dict-debug-fixes:
  Use ZEEK_DICT_DEBUG more in Dict.cc instead of DEBUG
2022-05-25 09:38:06 -07:00
Tim Wojtulewicz
0b1c8575cc Merge remote-tracking branch 'origin/topic/timw/avoid-needing-flex-arguments'
* origin/topic/timw/avoid-needing-flex-arguments:
  Move fuzzer setup in CMake below builtin plugin setup
  Remove flex/bison flags from CI build
  Update cmake submodule [nomail]
2022-05-25 09:37:31 -07:00
Christian Kreibich
d4ecfa0a67 Merge branch 'topic/christian/installation-dirs-in-scriptland'
* topic/christian/installation-dirs-in-scriptland:
  Add scripts.base.misc.installation btest
  Add base/misc/installation.zeek, with Zeek installation directories
  Ensure presence of Zeek-related directories in toplevel CMakeLists.txt
2022-05-24 12:12:05 -07:00
Tim Wojtulewicz
a61bc16b10 Merge remote-tracking branch 'origin/topic/timw/dockerfile-versions'
* origin/topic/timw/dockerfile-versions:
  Add DOCKERFILE_VERSION variable to all CI dockerfiles
2022-05-23 17:47:20 -07:00
Tim Wojtulewicz
73273fc87b Merge remote-tracking branch 'origin/topic/vern/ZAM-inlining'
* origin/topic/vern/ZAM-inlining:
  speed up ZAM compilation by capping function size when inlining
2022-05-19 11:45:50 -07:00
Christian Kreibich
7b43153785 Merge branch 'topic/christian/build-path-tweak'
* topic/christian/build-path-tweak:
  Zeekify the scripts.base.utils.paths test
  Expand build_path() function to handle empty dir arguments gracefully
2022-05-19 11:25:08 -07:00
Tim Wojtulewicz
48c978ae17 Merge remote-tracking branch 'origin/topic/timw/cirrus-ccache'
* origin/topic/timw/cirrus-ccache:
  Rework .cirrus.yml a bit to commonize some parts
  Enable 'greedy' mode for other CI builds
  Enable ccache for Cirrus builds
  Fix SSL tests on Centos Stream 9
2022-05-19 10:52:11 -07:00
Tim Wojtulewicz
ee85595e48 Merge remote-tracking branch 'origin/topic/timw/disable-spicy-for-coverity-builds'
* origin/topic/timw/disable-spicy-for-coverity-builds:
  Disable Spicy in Zeek Coverity builds
2022-05-19 09:13:25 -07:00
Tim Wojtulewicz
1223386fd3 Merge remote-tracking branch 'origin/topic/bbannier/spicy-helper-scripts'
* origin/topic/bbannier/spicy-helper-scripts:
  Always generate helper scripts for Spicy.
2022-05-18 11:12:08 -07:00
Tim Wojtulewicz
840a57b458 Merge remote-tracking branch 'origin/topic/johanna/openssl-3-fips'
* origin/topic/johanna/openssl-3-fips:
  Partially revert OpenSSL hashing changes
2022-05-18 11:07:40 -07:00
Tim Wojtulewicz
327eca32fd Merge remote-tracking branch 'origin/topic/timw/1672-table-expiration-deletion'
* origin/topic/timw/1672-table-expiration-deletion:
  GH-1672: Keep a reference to a table being expired, just in case
2022-05-18 11:07:13 -07:00
Tim Wojtulewicz
92a7773dd5 Merge remote-tracking branch 'origin/topic/timw/unneeded-fmt'
* origin/topic/timw/unneeded-fmt:
  Remove unnecessary uses of util::fmt()
2022-05-17 09:15:37 -07:00
Tim Wojtulewicz
aaaca5d5a6 Merge remote-tracking branch 'origin/topic/bbannier/spicy'
* origin/topic/bbannier/spicy:
  Add NEWS item for new requirements due to default-enabled Spicy support.
  Include headers in binary dir before other headers.
  Increase memory in CI.
  Add tests for bundled Spicy infrastructure.
  Include spicy in build.
  Add `bare_mode` bif.
  Change test so included plugins can load notice framework.
  Do not log function arguments in test.
2022-05-17 08:50:33 -07:00
Tim Wojtulewicz
3233400930 Merge remote-tracking branch 'origin/topic/timw/1857-input-log-messages'
* origin/topic/timw/1857-input-log-messages:
  Move some repetitive code into a separate method
  Store location during Ascii input parsing for use in error messages
  Include file information in input reader error messages
2022-05-16 17:00:34 -07:00
Tim Wojtulewicz
3d133ccb0a Merge remote-tracking branch 'origin/topic/vern/CPP-feature-complete'
* origin/topic/vern/CPP-feature-complete:
  NEWS items for script profiling, "footprint" BiFs, and Trigger method deprecations
  tweaks per reviewing feedback
  make deprecation advice a bit more helpful
  format shell scripts per style guide
  add deprecation for Trigger Cache/Lookup interfaces
  helper scripts for -O C++ maintenance
  "-O use-C++" now fails if no C++ bodies wound up being applicable
  update environemnt variable names to match command-line arguments
  final changes for -O C++ feature completeness, mainly "when" statement support
  Change "when" statements that don't require closures to use new implementation. Provide hooks for script optimization access to "when" statements. Regularize treatment of naming and timeouts for Triggers.
  switch cached Trigger values to be opaque-and-generic, rather than assuming CallExpr's
  tracking of when statements/expressions occur in a "when" context
  fix bug that sometimes associated the wrong location with global statements
  fix incomplete AST traversal of "when" statements
  add some missing "when" closures
  regularize test suite names to avoid custom/outdated suffices
2022-05-16 16:59:59 -07:00
Tim Wojtulewicz
8184073ef8 Merge remote-tracking branch 'origin/topic/timw/fix-freebsd-14-pip'
* origin/topic/timw/fix-freebsd-14-pip:
  Call pip using python -m flag during FreeBSD CI prep
2022-05-16 13:14:43 -07:00
Tim Wojtulewicz
5c34c777bd Merge remote-tracking branch 'origin/topic/timw/1797-string-allocations'
* origin/topic/timw/1797-string-allocations:
  Store hash analyzer kind StringVals for later reuse
  Add Component::GetCanonicalNameVal to avoid extra StringVal allocations
  Avoid type unnecessary type conversion in ComponentManager::GetComponentName
  Only set connection history if strings differ
2022-05-16 09:11:06 -07:00
Tim Wojtulewicz
6268baed35 Merge remote-tracking branch 'origin/topic/timw/script-profile-move-operator'
* origin/topic/timw/script-profile-move-operator:
  Explicitly define copy and move operators/constructors for ScriptProfileStats
2022-05-16 09:10:30 -07:00
Tim Wojtulewicz
1d20e28e5c Merge remote-tracking branch 'origin/topic/timw/retry-update-traces'
* origin/topic/timw/retry-update-traces:
  Add --retry to curl invocations in update-traces
2022-05-16 09:09:47 -07:00
Tim Wojtulewicz
55297a2e73 Merge remote-tracking branch 'origin/topic/timw/2103-bifs-footprint-leak'
* origin/topic/timw/2103-bifs-footprint-leak:
  GH-2103: Disable leak detection for bifs.footprint in another way
2022-05-16 09:09:17 -07:00
Tim Wojtulewicz
6cd3724747 Merge remote-tracking branch 'origin/topic/neverlord/gh-2084'
* origin/topic/neverlord/gh-2084:
  Fix formatting
  Fix UB during early shutdown on OpenSSL state
2022-05-13 16:51:05 -07:00