Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
16491 commits 387 branches 195 tags 255 MiB
Commit graph

3151 commits

Author SHA1 Message Date
Tim Wojtulewicz
04c8a6bde7 Merge remote-tracking branch 'origin/topic/vern/smb-filtering' 
* origin/topic/vern/smb-filtering:
  Fix for suppressing SMB logging of previously-logged files
 2024-05-20 15:54:19 -07:00
Tim Wojtulewicz
1a0fffd714 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to latest dev snapshot
 2024-05-17 08:56:45 -07:00
Tim Wojtulewicz
87870f8345 Merge remote-tracking branch 'origin/topic/vern/zam-subnet-fix' 
* origin/topic/vern/zam-subnet-fix:
  Fix for ZAM inlining of nested function calls with the same parameter names
  Fixed ZAM logic error in canonicalizing specialized min/max instructions
  Fixed order-of-evaluation bug in ZAM Subnet-To-Addr instruction
  "-a zam" BTest baseline update reflecting recent Spicy baseline change
 2024-05-16 11:09:33 -07:00
Tim Wojtulewicz
237f4c39a4 Merge branch 'topic/timw/no-spicy-head-on-releases' 
* topic/timw/no-spicy-head-on-releases:
  CI: Disable spicy_head task for release branches
 2024-05-16 09:35:06 -07:00
Tim Wojtulewicz
a4d7587bca Merge remote-tracking branch 'origin/topic/timw/fix-coverage-build' 
* origin/topic/timw/fix-coverage-build:
  CI: Use llvm-cov-18 on Cirrus for building coverage data
 2024-05-15 20:00:58 -07:00
Tim Wojtulewicz
8337b5f018 Merge remote-tracking branch 'origin/topic/timw/ubuntu-24-sanitizers' 
* origin/topic/timw/ubuntu-24-sanitizers:
  CI: Use clang-18 on Ubuntu 24 for sanitizers builds, enable TSan builds
  CI: Add clang-18 to Ubuntu 24.04 VM
 2024-05-13 17:40:52 -07:00
Robin Sommer
e5fa105a1f
Merge remote-tracking branch 'origin/topic/robin/spicy-gh-1657' 
* origin/topic/robin/spicy-gh-1657:
  Apply missing fix for https://github.com/zeek/spicy/pull/1723.
 2024-05-13 16:39:15 +02:00
Robin Sommer
0edc115ffc
Merge remote-tracking branch 'origin/topic/robin/revert-deferred' 
Includes Spicy bump.

* origin/topic/robin/revert-deferred:
  Spicy: Update for https://github.com/zeek/spicy/pull/1738.
 2024-05-13 12:20:21 +02:00
Tim Wojtulewicz
a9649026ae Merge remote-tracking branch 'origin/topic/timw/ci-ubuntu-24-lts' 
* origin/topic/timw/ci-ubuntu-24-lts:
  CI: Update asan and ubsan tasks to use Ubuntu 22.04 VM
  CI: Replace Ubuntu 23.10 with Ubuntu 24.04
 2024-05-10 10:19:53 -07:00
Robin Sommer
82be6425e6
Merge remote-tracking branch 'origin/topic/robin/gh-3561-forward-to-udp' 
* origin/topic/robin/gh-3561-forward-to-udp:
  Update docs.
  Add explicit children life-cycle management method to analyzers.
  Spicy: Support UDP in Spicy's `protocol_*` runtime functions.
  Add method to analyzer to retrieve direct child by name.
  Extend PIA's `FirstPacket` API.
  Spicy: Prepare for supporting forwarding to protocols other than TCP.
 2024-05-10 11:15:20 +02:00
Tim Wojtulewicz
0301d2eb22 Merge remote-tracking branch 'origin/topic/timw/update-zeekctl-zkg' 
* origin/topic/timw/update-zeekctl-zkg:
  Update package-manager submodule [nomail]
  Update zeekctl submodule [nomail]
 2024-05-08 13:10:43 -07:00
Tim Wojtulewicz
b2e4fbe58d Merge remote-tracking branch 'origin/topic/vern/gen-zam-multi-files' 
* origin/topic/vern/gen-zam-multi-files:
  enable ZAM operation specifications to reside in multiple files (not yet used)
 2024-05-08 13:09:35 -07:00
Tim Wojtulewicz
2c46d3139c Merge remote-tracking branch 'origin/topic/timw/3417-packet-analysis-detail' 
* origin/topic/timw/3417-packet-analysis-detail:
  Move packet_analysis::Dispatcher to detail namespace
 2024-05-08 09:55:16 -07:00
Tim Wojtulewicz
554294bb84 Merge remote-tracking branch 'origin/topic/vern/ssh-half-duplex' 
* origin/topic/vern/ssh-half-duplex:
  make SSH analyzer robust to half-duplex connections
 2024-05-07 12:02:43 -07:00
Tim Wojtulewicz
29f5a49baf Merge remote-tracking branch 'origin/topic/christian/private_address_clarification' 
* origin/topic/christian/private_address_clarification:
  Clarify membership in the Site::private_address_space prefix list. [skip ci]
 2024-05-07 10:26:50 -07:00
Tim Wojtulewicz
d463141ded Merge remote-tracking branch 'origin/topic/christian/fix-zeekygen-crash' 
* origin/topic/christian/fix-zeekygen-crash:
  Avoid segfault when generating Zeekygen docs on Zeek-internal identifiers.
  Add btest for Zeekygen docs extraction on identifiers defined by the Zeek core.
 2024-05-07 10:26:19 -07:00
Robin Sommer
9c1ecd205c
Updating CHANGES and VERSION, and bump Spicy and docs. 2024-05-07 10:03:17 +02:00
Tim Wojtulewicz
fc0d4d2216 Merge remote-tracking branch 'origin/topic/timw/update-broker' 
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
 2024-05-06 17:00:01 -07:00
Tim Wojtulewicz
fb0dab2fb2 Merge remote-tracking branch 'origin/topic/timw/3389-tuning-defaults-deprecation' 
* origin/topic/timw/3389-tuning-defaults-deprecation:
  Move the options from policy/tuning/defaults to actual Zeek defaults, deprecate that package
 2024-05-06 11:16:34 -07:00
Tim Wojtulewicz
cdcd83c8cc Merge remote-tracking branch 'origin/topic/vern/val-footprint-strings' 
* origin/topic/vern/val-footprint-strings:
  refine Val "footprint" to equate long strings with multiple objects
 2024-05-02 19:01:06 -07:00
Tim Wojtulewicz
404c756286 Merge remote-tracking branch 'origin/topic/timw/const-rulematcher' 
* origin/topic/timw/const-rulematcher:
  Constify classes in RuleMatcher, fixes c++20 build failure
 2024-05-02 10:21:55 -07:00
Tim Wojtulewicz
d7e30d9ee2 Merge remote-tracking branch 'origin/topic/johanna/gh-3700' 
* origin/topic/johanna/gh-3700:
  Fix cid propagation into files.log
 2024-04-29 09:09:41 -07:00
Tim Wojtulewicz
522bce8d58 Merge remote-tracking branch 'origin/topic/vern/script-opt.May24' 
* origin/topic/vern/script-opt.May24:
  factored BTest constants into globals to prevent premature ZAM optimization when testing
  addressed minor issues flagged by Coverity
 2024-04-29 09:08:28 -07:00
Tim Wojtulewicz
19702b06e7 Merge remote-tracking branch 'origin/topic/timw/val-avoid-type-casting' 
* origin/topic/timw/val-avoid-type-casting:
  Avoid calling typecasts in Val when we have direct access to the underlying value object
 2024-04-29 09:06:39 -07:00
Tim Wojtulewicz
ad6d70d4e6 Merge remote-tracking branch 'pbcullen/topic/pbcullen/shadow-file-handling' 
* pbcullen/topic/pbcullen/shadow-file-handling:
  reformat changes
  Gracefully handle empty/missing shadow file
 2024-04-26 12:29:28 -07:00
Christian Kreibich
7fdbb73511 Merge branch 'topic/christian/3671-fix-icmp-caplen-violations' 
* topic/christian/3671-fix-icmp-caplen-violations:
  Factor in caplens in ICMPAnalyzer::DeliverPacket length calculations
 2024-04-26 11:18:34 -07:00
Tim Wojtulewicz
c7a21c18c8 Merge remote-tracking branch 'origin/topic/vern/ZAM-perf.Apr24' 
* origin/topic/vern/ZAM-perf.Apr24: (27 commits)
  BTest updates for changes due to use of ZAM BiF replacements
  rewrite of ZAM optimization of BiFs and script functions/idioms
  flag base script as being known to ZAM optimization
  ZAM optimization for constructing records w/ fields initialized to network_time
  factor some functionality used by BiFs to make accessible to ZAM instructions
  factor script optimization Expr AST nodes out of main AST header
  new internal AST node for expression idioms with corresponding ZAM built-ins
  streamlining of expressions only used for script optimization
  reordering of expressions to match main usage vs. script-optimization extras
  support for conditional expressions transforming into interal has-elements expr
  make same_expr() functionality accessible as a utility
  unify functionality across EqExpr and RelExpr classes
  introduce notions of script functions/BiFs that are (1) foldable, (2) replaceable
  optimization of scripting idioms - min/max, has-elements
  hooks for ZAM optimization of calls to particular functions
  shift ZAM maintenance monitoring of new BiFs to a BTest so it automatically runs
  make externally available the expression used for initializating a record field
  record field initialization optimization: do coercions at compile-time if applicable
  $ZAM_PROFILE_ALL set tells ZAM to profile function bodies even if not executed
  performance speed-up for SMB base scripts
  ...
 2024-04-25 09:16:13 -07:00
Tim Wojtulewicz
cbf9ff47e8 Merge remote-tracking branch 'origin/topic/timw/3662-ignore-disabled-writer-frontends' 
* origin/topic/timw/3662-ignore-disabled-writer-frontends:
  Don't attempt to stop or flush disabled writer frontends
 2024-04-22 17:08:33 -07:00
Tim Wojtulewicz
4f9049278b Merge remote-tracking branch 'origin/topic/timw/3593-smb-multi-request-header' 
* origin/topic/timw/3593-smb-multi-request-header:
  Allow SMB_TCP record to contain multiple protocol identifiers/headers
 2024-04-22 15:56:02 -07:00
Tim Wojtulewicz
5aa18287f1 Merge remote-tracking branch 'origin/topic/timw/3456-when-unknown-capture' 
* origin/topic/timw/3456-when-unknown-capture:
  Check for valid identifier in WhenStmt::Describe
 2024-04-22 15:16:16 -07:00
Tim Wojtulewicz
d566961da5 Merge remote-tracking branch 'pbcullen/topic/pbcullen/remove_exclude' 
* pbcullen/topic/pbcullen/remove_exclude:
  Update core.pcap.filter-warning baseline
  Add PacketFilter::remove_exclude function
 2024-04-18 09:03:57 -07:00
Christian Kreibich
d09584e52e Merge branch 'topic/christian/localversion' 
* topic/christian/localversion:
  Parse and store localversion string
  Remove commented-out code
  Check ZEEK_VERSION_LOCAL for dashes
  Update version string btests for localversion
  Modify version parsing for localversion
  Update version used by spicyz
  Update build script
  Support for configurable localversion
 2024-04-17 15:00:11 -07:00
Tim Wojtulewicz
9c668212ff Merge remote-tracking branch 'origin/topic/vern/zam-while-fix' 
* origin/topic/vern/zam-while-fix:
  fix for ZAM optimization of "while" loops
 2024-04-17 14:34:03 -07:00
Tim Wojtulewicz
1563814c4a Merge remote-tracking branch 'origin/topic/johanna/opensuse-leap-15.6-ci' 
* origin/topic/johanna/opensuse-leap-15.6-ci:
  Add Opensuse leap 15.6 to CI
 2024-04-17 09:21:12 -07:00
Robin Sommer
5236c73e39
Merge remote-tracking branch 'origin/topic/robin/bump-spicy' 
* origin/topic/robin/bump-spicy:
  Bump Spicy.
  Remove support for old Spicy versions from QUIC analyzer.
 2024-04-15 17:53:26 +02:00
Tim Wojtulewicz
6c88bd115c Merge remote-tracking branch 'origin/topic/timw/fix-pcap-override' 
* origin/topic/timw/fix-pcap-override:
  Make sure that vcpkg isn't preferred if pcap_root_dir is passed in
 2024-04-11 15:28:18 -07:00
Robin Sommer
da7457340c
Merge remote-tracking branch 'origin/topic/robin/bump-spicy' 
* origin/topic/robin/bump-spicy:
  Remove some unused Spicy state.
  Bump Spicy.
 2024-04-10 11:03:46 +02:00
Tim Wojtulewicz
06b6df48a8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Apr24' 
* origin/topic/vern/script-opt-maint.Apr24:
  ZAM fix for concretizing vectors in record constructors
  improve ZAM's estimation of profiling overheads
 2024-04-09 15:12:22 -07:00
Tim Wojtulewicz
0438c8944d Merge remote-tracking branch 'origin/topic/timw/fix-macos-build-again' 
* origin/topic/timw/fix-macos-build-again:
  CI: Remove commented openssl 1.1 workaround from macOS preparation script
  CI: Fix installation of python package on macOS
 2024-04-08 12:02:13 -07:00
Tim Wojtulewicz
da0c1ca089 Merge remote-tracking branch 'origin/topic/vern/zam-cat-time-fix' 
* origin/topic/vern/zam-cat-time-fix:
  fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior
 2024-04-02 08:17:18 -07:00
Tim Wojtulewicz
32c7fececc Merge branch 'topic/timw/fix-macos-build' 
* topic/timw/fix-macos-build:
  CI: Specify the xcode version of the macOS Sonoma instance
 2024-03-29 11:15:37 -07:00
Christian Kreibich
a928bd98a2 Merge branch 'topic/christian/zeek-lib-fix' 
* topic/christian/zeek-lib-fix:
  Remove vestigial Conan bit in CMakeLists.txt
  When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
  Fix a typo in CMakeLists.txt when building Zeek as a library
 2024-03-28 11:11:30 -07:00
Robin Sommer
c4499d8552
Merge remote-tracking branch 'origin/topic/robin/bump-spicy' 
* origin/topic/robin/bump-spicy:
  Bump Spicy to current `main`.
 2024-03-25 11:26:02 +01:00
Tim Wojtulewicz
86d1812d49 Merge remote-tracking branch 'origin/topic/vern/fine-grained-ZAM-profiling' 
* origin/topic/vern/fine-grained-ZAM-profiling:
  tie into updates to gen-zam
  ZAM documentation updated to reflect finer-grained profiling
  ZAM-specific BTest baseline changes for tweak to how ZAM bodies print
  BTest baseline changes for tweak to how ZAM bodies print
  ZAM execution changes to support richer profiling
  use richer block-aware location information for ZAM instructions
  better isolation of ZAM instruction elements hooks for tracking extended ZAM profiling location
  framework for --enable-ZAM-profiling configuration profiles go to zprof.log rather than stdout
  ZAM classes in support of finer-grained profiling
  refined ZAM function profiling to include (correct) statement line number blocks
  avoid potentially expensive mallinfo() call if result won't be used
 2024-03-19 14:39:38 -07:00
Tim Wojtulewicz
5402f22d48 Merge remote-tracking branch 'origin/topic/timw/fix-std-function-stmt' 
* origin/topic/timw/fix-std-function-stmt:
  Remove variant from StdFunctionStmt
 2024-03-19 10:59:31 -07:00
Tim Wojtulewicz
8bfe32e931 Merge remote-tracking branch 'origin/topic/timw/std-function-event-handler' 
* origin/topic/timw/std-function-event-handler:
  Add a method to register an event handler to a std::function via C++
 2024-03-18 16:38:14 -07:00
Tim Wojtulewicz
aac723cfe5 Merge remote-tracking branch 'origin/topic/neverlord/broker-bump' 
* origin/topic/neverlord/broker-bump:
  Update Broker submodule
 2024-03-18 16:16:18 -07:00
Arne Welzel
a45489de90 Merge remote-tracking branch 'origin/topic/awelzel/3442-evt-port-deprecation' 
* origin/topic/awelzel/3442-evt-port-deprecation:
  btest/spicy: Remove most port usages
  spicy: Deprecate port/ports in .evt files
 2024-03-18 10:07:54 +01:00
Robin Sommer
139562eb8d
Merge remote-tracking branch 'origin/topic/robin/binary-build-fix' 
* origin/topic/robin/binary-build-fix:
  Add a CI test with the same options as we used for binary builds.
  Fix binary build of `spicyz`.
 2024-03-16 11:15:33 +01:00
Christian Kreibich
c3caa4f6c3 Merge remote-tracking branch 'origin/topic/timw/ci-remove-centos7-debian10' 
* origin/topic/timw/ci-remove-centos7-debian10:
  CI: Remove CentOS 7 and Debian 10 builds
 2024-03-15 13:15:16 -07:00