Commit graph

2886 commits

Author SHA1 Message Date
Tim Wojtulewicz
16a69864b4 Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'
* origin/topic/timw/3184-modbus-extensions:
  Pass parsed file record information with ReadFile/WriteFile events
  Add length field from header to ModbusHeaders record type
  Modbus: Add support for Encapsulation Interface Transport (FC=2B) requests and responses
  Modbus: Add support for Diagnostics (FC=8) requests and responses
2023-08-08 10:55:25 -07:00
Tim Wojtulewicz
e3a34e44b5 Revert "Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'"
This reverts commit 30b2afe2ad, reversing
changes made to bacc0dcae3.
2023-08-08 10:54:33 -07:00
Tim Wojtulewicz
30b2afe2ad Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'
* origin/topic/timw/3184-modbus-extensions:
  Pass parsed file record information with ReadFile/WriteFile events
  Add length field from header to ModbusHeaders record type
  Modbus: Add support for Encapsulation Interface Transport (FC=2B) requests and responses
  Modbus: Add support for Diagnostics (FC=8) requests and responses
2023-08-07 14:34:43 -07:00
Tim Wojtulewicz
bacc0dcae3 Merge remote-tracking branch 'origin/topic/timw/cmake-find-package'
* origin/topic/timw/cmake-find-package:
  Change VERSION variable in CMake config to ZEEK_VERSION_FULL
  Update bifcl and binpac for FindPackage fixes
  Remove usage of FindRequiredPackage
  Update zeekctl and cmake to deprecate FindRequiredPackage
  Update broker submodule for pybind11 + cmake changes
2023-08-07 09:42:02 -07:00
Arne Welzel
bb9faab83b 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
2023-08-07 10:22:38 +02:00
Arne Welzel
0d229ee84a Merge remote-tracking branch 'origin/topic/awelzel/2668-default-create-insert-assign-or-so'
* origin/topic/awelzel/2668-default-create-insert-assign-or-so:
  TableVal: Unify &default and &default_insert lookups
  Add &default_insert attribute for tables
2023-08-04 12:32:06 +02:00
Johanna Amann
81ce83590d Merge remote-tracking branch 'origin/topic/johanna/tcp-padding'
* origin/topic/johanna/tcp-padding:
  Do not forward padding to downstream TCP packet analyzer
2023-08-03 07:18:49 +01:00
Tim Wojtulewicz
d00a89a5a1 Merge remote-tracking branch 'origin/topic/timw/rename-bro-plugin'
* origin/topic/timw/rename-bro-plugin:
  Rename magic __bro_plugin__ file to __zeek_plugin__
2023-08-02 10:11:31 -07:00
Arne Welzel
1a54e66b53 Merge branch 'topic/awelzel/3122-attribute-expression-seeds'
* topic/awelzel/3122-attribute-expression-seeds:
  UsageAnalyzer: Collect identifiers found in attributes as seeds
2023-08-02 09:52:41 +02:00
Tim Wojtulewicz
a090fb936a Merge remote-tracking branch 'origin/topic/timw/script-opt-memory-leak'
* origin/topic/timw/script-opt-memory-leak:
  Fix memory leak in script_opt's Expr code
2023-08-01 09:58:13 -07:00
Tim Wojtulewicz
3c7a52d0a7 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
2023-07-31 15:59:59 -07:00
Tim Wojtulewicz
bd75d72f3f Merge remote-tracking branch 'origin/topic/vern/zam-memory-reduction'
* origin/topic/vern/zam-memory-reduction:
  Baseline "-a zam" update
  increase BTest wait time to abide ZAM compilation times
  avoid script coverage overhead (especially memory) when using ZAM
  fixes for correctly tracking which functions have been fully inlined
  support for discarding ASTs once compiled via ZAM script optimization
  some code simplifications and streamlining
2023-07-26 14:46:23 -07:00
Tim Wojtulewicz
b3940b6db3 Merge remote-tracking branch 'origin/topic/vern/lambda-scope-tweak'
* origin/topic/vern/lambda-scope-tweak:
  fix for installing identifiers for lambdas into the global scope
2023-07-25 10:23:59 -07:00
Tim Wojtulewicz
c7ff0c2219 Merge remote-tracking branch 'origin/topic/johanna/better-input-framework-messages-with-optional-or-index-that-is-not-set'
* origin/topic/johanna/better-input-framework-messages-with-optional-or-index-that-is-not-set:
  Better input framework error messages for unset non-optionals
2023-07-25 09:36:36 -07:00
Tim Wojtulewicz
80aea71089 Merge remote-tracking branch 'origin/topic/timw/cpp-script-opt-code-gen-modernization'
* origin/topic/timw/cpp-script-opt-code-gen-modernization:
  Bump debian 11 and alpine Dockerfile versions
  Fix script_opt/cpp test scripts to work correctly on all platforms
  CPP code-gen: Use std::move for constructor arguments
  CPP code-gen: Mark child classes final, remove final from function defs
2023-07-25 09:35:13 -07:00
Tim Wojtulewicz
2f1238089c Merge remote-tracking branch 'origin/topic/timw/print-opaque-type'
* origin/topic/timw/print-opaque-type:
  Print type of opaque instead of 'no value description'
2023-07-20 09:23:55 -07:00
Tim Wojtulewicz
819b79e121 Merge remote-tracking branch 'origin/topic/vern/dyn-sig-actions'
* origin/topic/vern/dyn-sig-actions:
  allow signature actions to be dynamically updated
2023-07-17 16:35:15 -07:00
Tim Wojtulewicz
1f39a33442 Merge remote-tracking branch 'origin/topic/vern/ZAM-maint.Jul23'
* origin/topic/vern/ZAM-maint.Jul23:
  ZAM btest baseline update
  more extensive ZAM inlining & compilation of lambdas
  fixes for ZAM compilation of switch statements
  fix for ZAM inlining failing to inline function call arguments
  avoid constructing TypeList's on-the-fly for ListVal's with fixed types
  ZAM optimization for ?$ operator applied to non-optional fields
  ASSERT seatbelts for low-level vector accesses
  comment typo
  low-level ZAM micro-optimizations
  fix for recent smart pointer change
2023-07-17 16:33:46 -07:00
Tim Wojtulewicz
fdf45df65a Merge remote-tracking branch 'origin/topic/vern/CPP-maint.Jul23'
* origin/topic/vern/CPP-maint.Jul23:
  -O gen-C++ fix for recent smart pointer changes
  -a cpp Btest baseline updates
  minor BTest generalizations & simplifications
  fixes for compiling function calls that return non-error nil ValPtr's
2023-07-14 09:15:48 -07:00
Arne Welzel
b6bff8aa37 Merge remote-tracking branch 'origin/topic/awelzel/2709-colon-colon-for-global'
* origin/topic/awelzel/2709-colon-colon-for-global:
  ci: Bust Ubuntu 22.10 image cache
  Support :: prefix to reference global namespace, deprecate GLOBAL::
2023-07-12 17:29:51 +02:00
Tim Wojtulewicz
f9904511ab 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
2023-07-11 16:17:12 -07:00
Tim Wojtulewicz
c23ee30542 Merge remote-tracking branch 'origin/topic/timw/clang-tidy-fixups'
* origin/topic/timw/clang-tidy-fixups:
  Remove unused state_label() method from ssl analyzer binpac files
  Mark some overridden functions with override keyword
  Use emplace_back over push_back where appropriate
  packet_analysis: Define all plugin type as final
  Use std::make_unique in one place instead of declaring unique_ptr directly
  Avoid unnecessary type names in return statements
  Simplify type trait usage (remove ::value usage)
  A handful of int-to-bool conversions
  Replace empty destructor bodies with =default definitions
  Reduce amount of files passed to clang-tidy
2023-07-07 09:57:10 -07:00
Robin Sommer
cd2c193cb2
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.
2023-07-07 11:46:29 +02:00
Arne Welzel
f00dac544e Merge remote-tracking branch 'origin/topic/vern/GH-3159.B'
* origin/topic/vern/GH-3159.B:
  Fix for nested "when" statements leading to confusion over scoping
2023-07-06 11:35:47 +02:00
Arne Welzel
2da6f94ab6 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
2023-07-06 09:30:20 +02:00
Tim Wojtulewicz
8f79bea18e Merge remote-tracking branch 'origin/topic/robin/spicy-build-dir-for-dev'
* origin/topic/robin/spicy-build-dir-for-dev:
  Set `SPICY_BUILD_DIRECTORY` in `zeek-path-dev`.
2023-07-05 13:32:50 -07:00
Tim Wojtulewicz
d1ed0e577b Merge remote-tracking branch 'origin/topic/awelzel/3028-connection-flipped'
* origin/topic/awelzel/3028-connection-flipped:
  Update dump-events baseline, not running with OpenSSL 3
  Conn: In-place val flip and connection_flipped()
  Conn: Remove is_version_sep()
  Remove icmp_conn leftovers
2023-07-05 13:32:34 -07:00
Tim Wojtulewicz
d5b9221356 Merge remote-tracking branch 'origin/topic/bbannier/issue-3101-master'
* origin/topic/bbannier/issue-3101-master:
  Bump Spicy to latest release.
2023-07-05 10:23:35 -07:00
Tim Wojtulewicz
0b217e0e76 Updating CHANGES and VERSION. 2023-07-05 08:34:17 -07:00
Arne Welzel
fe71202f25 Merge remote-tracking branch 'origin/topic/awelzel/global-ids-with-modules'
* origin/topic/awelzel/global-ids-with-modules:
  global_ids(): Include module names
2023-07-05 15:33:30 +02:00
Arne Welzel
123dfafc56 Update zeekjs submodule to 0.9.4 2023-06-30 17:32:59 +02:00
Arne Welzel
fcc38d3b4f Merge remote-tracking branch 'origin/topic/vern/zam-feature-complete'
* origin/topic/vern/zam-feature-complete: (23 commits)
  documentation updates
  updates to ZAM-specific BTest baseline
  Address PR review feedback on zam-feature-complete
  Updates to BTest baselines due to previous BTest tweaks
  tweaks to BTests for ZAM feature completeness; new ZAM-only btest
  removal of unused functionality and some follow-on simplifications
  feature completeness for ZAM
  -O gen-C++ tweaks to be compatible with ZAM changes
  ZAM support for "when" statements
  ZAM changes intermixed with lambda and "when" support
  WhenStmt/WhenInfo restructuring in support of ZAM "when" statements
  ZAM support for lambdas
  ZAM internals have a notion of "captures" as global-like variables
  AST profiling enhnacements in support of script optimization for lambdas/whens
  refinements to LambdaExpr's to provide flexibility, support for ZVal captures
  support in ScriptFunc class for ZVal-oriented vector of captures
  simplifications to the Frame class now that it no longer has to support old-style captures
  use Ingredients directly for constructing functions
  the "Capture" struct is now a class
  more debugging information when dumping script optimization data structures
  ...
2023-06-30 10:19:44 +02:00
Tim Wojtulewicz
e4c972da5c Merge remote-tracking branch 'origin/topic/timw/move-cmake-template-files'
* origin/topic/timw/move-cmake-template-files:
  Move CMake template files to separate directory
2023-06-29 11:23:06 -07:00
Arne Welzel
9862654365 Merge remote-tracking branch 'origin/topic/awelzel/3142-from-json-field-name-normalizer'
* origin/topic/awelzel/3142-from-json-field-name-normalizer:
  Add test with MUD example
  from_json: Support function to normalize key names
2023-06-29 18:34:18 +02:00
Tim Wojtulewicz
a184816c80 Merge remote-tracking branch 'origin/topic/bbannier/issue-3153'
* origin/topic/bbannier/issue-3153:
  Prefer Spicy include directories of this build over accidental ones.
2023-06-27 12:18:47 -07:00
Arne Welzel
b18122da08 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.
2023-06-27 18:21:34 +02:00
Tim Wojtulewicz
16ec1bb3fe Merge remote-tracking branch 'origin/topic/awelzel/no-rapidjson-include-in-headers'
* origin/topic/awelzel/no-rapidjson-include-in-headers:
  formatters/JSON: Make JSON::NullDoubleWriter use zeek::json::detail version
  formatters/JSON: Remove surrounding_braces
  formatters/JSON: Prepare to remove rapidjson from installed Zeek headers
2023-06-21 17:45:47 -07:00
Tim Wojtulewicz
87081a728c Update zeekjs submodule 2023-06-21 15:36:48 -07:00
Tim Wojtulewicz
0fbfaeb996 Merge remote-tracking branch 'origin/topic/awelzel/no-metrics-centralization'
* origin/topic/awelzel/no-metrics-centralization:
  telemetry: Disable metrics centralization by default
2023-06-21 15:33:59 -07:00
Tim Wojtulewicz
93988d6db6 Merge remote-tracking branch 'origin/topic/johanna/gh-3144'
* origin/topic/johanna/gh-3144:
  GSSAPI: basic support for MIC/WRAP tokens
2023-06-21 15:33:36 -07:00
Tim Wojtulewicz
46715dacfd 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
2023-06-20 10:15:37 -07:00
Tim Wojtulewicz
77689b202f Merge remote-tracking branch 'origin/topic/timw/btest-updates'
* origin/topic/timw/btest-updates:
  Update external testing hashes for 6.1 deprecation changes
  Remove leftover baseline files from 6.1 deprecation removal
2023-06-15 21:14:04 -07:00
Tim Wojtulewicz
e804561856 Merge remote-tracking branch 'origin/topic/timw/dce-rpc-updates'
* origin/topic/timw/dce-rpc-updates:
  Update dce-rpc constants
2023-06-15 16:27:50 -07:00
Tim Wojtulewicz
38a3385daa Merge remote-tracking branch 'origin/topic/vern/CPP-Jun23-maint'
* origin/topic/vern/CPP-Jun23-maint:
  -O gen-C++ refinements for BiF failures, negative vector indices, boolean vector operations
2023-06-15 16:25:58 -07:00
Tim Wojtulewicz
c0a0f719d1 Merge remote-tracking branch 'origin/topic/vern/ZAM-Jun23-maint'
* origin/topic/vern/ZAM-Jun23-maint:
  ZAM documentation updates
  ZAM bug fix for incorrect management of global variables
  ZAM bug fix (simplification) for nested inline functions that don't do anything
  ZAM support for negative vector indices
  ZAM ignores new "assert" statement
  fixes for doing "script validation" to check for ZAM compile-ability
  tweak for Broker BTest that needs a delay for ZAM
  BTest baseline updates for minor Zeek differences (in one case, no difference)
  BTest to check for invalid negative vector indices
2023-06-15 14:21:26 -07:00
Tim Wojtulewicz
48af56c00b 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
2023-06-15 12:15:44 -07:00
Arne Welzel
5a9c6d4633 Merge remote-tracking branch 'origin/topic/awelzel/duplicate-plugin-no-debug'
* origin/topic/awelzel/duplicate-plugin-no-debug:
  plugin/Manager: Warn when plugin with the same name is found
2023-06-15 18:39:49 +02:00
Tim Wojtulewicz
b5b5df4e2d Merge remote-tracking branch 'origin/topic/timw/remove-6-1-deprecations'
* origin/topic/timw/remove-6-1-deprecations:
  Update docs submodule [nomail]
  Update external test baselines
  Change table initialization deprecation to error
  Remove 5.2 deprecation we missed
  Remove Supervisor::NodeConfig (6.1 deprecation)
  Remove LogAscii::logdir (6.1 deprecation)
  Make break/next/continue outside loops an error (6.1 deprecation)
  Remove analyzer_confirmation/analyzer_violation events (6.1 deprecation)
  Remove full scripts marked as 6.1 deprecations
  Remove script functions marked as unused (6.1 deprecations)
  Remove deprecations tagged for v6.1
2023-06-14 10:09:57 -07:00
Arne Welzel
84d605602f 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
2023-06-14 18:56:00 +02:00
Tim Wojtulewicz
881ea3f699 Merge remote-tracking branch 'origin/topic/timw/make-dist-fixes'
* origin/topic/timw/make-dist-fixes:
  Fix usage of realpath on macOS, instead preferring grealpath
  Don't generate minimal tarball anymore
2023-06-14 09:26:18 -07:00