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
15218 commits 387 branches 195 tags 255 MiB
Commit graph

2877 commits

Author SHA1 Message Date
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
Arne Welzel
0fe32715c0 Merge remote-tracking branch 'origin/topic/awelzel/pre-commit-typos' 
* origin/topic/awelzel/pre-commit-typos:
  all: Fix typos identified by typos pre-commit hook
  NEWS typo fixes
  Start with a typos pre-commit file
 2023-06-14 13:06:47 +02:00
Arne Welzel
2f1ea789d1 Merge remote-tracking branch 'origin/topic/awelzel/2285-assert-statement' 
* origin/topic/awelzel/2285-assert-statement:
  NEWS: Small section about assert statement
  Stmt: Rework assertion hooks break semantics
  Stmt: Introduce assert statement and related hooks
  ZeekArgs: Helper for empty arguments
  Reporter: Allow AssertStmt to throw InterpreterException
  Lift backtrace() code into Func.{h,cc}
 2023-06-14 12:51:53 +02:00
Tim Wojtulewicz
8175558a56 Merge remote-tracking branch 'origin/topic/bbannier/configure-summary-indention' 
* origin/topic/bbannier/configure-summary-indention:
  Clarify subitem relationship in CMake configure summary.
 2023-06-13 11:29:47 -07:00
Tim Wojtulewicz
9e2e6d0174 Merge remote-tracking branch 'origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup' 
* origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup:
  tests: Do not use archiver_rotation_format_func as postprocessor
 2023-06-13 11:28:34 -07:00
Arne Welzel
f53aefdd5b Merge branch 'topic/awelzel/3112-log-suffix-left-over-log-rotation' 
* topic/awelzel/3112-log-suffix-left-over-log-rotation:
  cluster/logger: Fix leftover-log-rotation in multi-logger setups
  cluster/logger: Fix global var reference
 2023-06-13 17:33:56 +02:00
Tim Wojtulewicz
4314bdfd38 Merge remote-tracking branch 'origin/topic/timw/update-broker' 
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
 2023-06-12 15:27:42 -07:00
Tim Wojtulewicz
27575df917 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 
* origin/topic/bbannier/bump-spicy:
  Bump `auxil/spicy`.
  Update link to slack in README.md
  Updating CHANGES and VERSION.
 2023-06-12 11:07:03 -07:00
Tim Wojtulewicz
98e44ee14f Merge remote-tracking branch 'origin/topic/awelzel/cluster-at-if-removal' 
* origin/topic/awelzel/cluster-at-if-removal:
  test-all-policy: Do not load nodes-experimental/manager.zeek
  cluster/main: Remove extra @if ( Cluster::is_enabled() )
 2023-06-12 11:04:53 -07:00
Tim Wojtulewicz
c389d9804b Merge remote-tracking branch 'origin/topic/awelzel/3099-fix-and-extend-socks5-sig' 
* origin/topic/awelzel/3099-fix-and-extend-socks5-sig:
  socks/dpd: Add newer auth methods
  socks/dpd: Fix socks5_server side signature
 2023-06-12 10:57:08 -07:00
Arne Welzel
857c15a293 Merge remote-tracking branch 'origin/topic/awelzel/choco-2' 
* origin/topic/awelzel/choco-2:
  ci/windows: choco --localonly is gone
 2023-06-09 11:04:14 +02:00
Arne Welzel
8717b01e21 Merge remote-tracking branch 'origin/topic/timw/update-pysubnettree-patricia' 
* origin/topic/timw/update-pysubnettree-patricia:
  Update zeekctl for pysubnetree/patricia upgrade
 2023-06-05 14:17:33 +02:00
Tim Wojtulewicz
fba058f7b7 Merge remote-tracking branch 'origin/topic/timw/remove-vendored-cmake-files' 
* origin/topic/timw/remove-vendored-cmake-files:
  Update bifcl, binpac, and broker repos for cmake changes
  bison_target argument changes from HEADER to DEFINES_FILE
  Update cmake submodule [nomail]
 2023-05-31 13:49:27 -07:00
Tim Wojtulewicz
037bceaf1b Updating CHANGES and VERSION. 2023-05-31 13:42:35 +02:00
Tim Wojtulewicz
3a0efb296f Updating CHANGES and VERSION. 2023-05-31 09:51:22 +02:00
Tim Wojtulewicz
5a3abbe364 Revert "Merge remote-tracking branch 'origin/topic/vern/at-if-analyze'" 
This reverts commit 4e797ddbbc, reversing
changes made to 3ac28ba5a2.
 2023-05-31 09:20:33 +02:00
Tim Wojtulewicz
4e797ddbbc Merge remote-tracking branch 'origin/topic/vern/at-if-analyze' 
* origin/topic/vern/at-if-analyze:
  updates reflecting review comments
  change base scripts to use run-time if's or @if ... &analyze
  a number of BTests updated with @if ... &analyze
  update for scripting coverage BTest demonstrating utility of @if ... &analyze
  BTests for new @if ... &analyze functionality
  "if ( ... ) &analyze" language feature
  classes for tracking "@if (...) &analyze" notion of code being/not being "activated"
  RemoveGlobal() method for Scope class + simplifying interfaces
 2023-05-26 14:56:01 -07:00
Arne Welzel
dbad8ab231 Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekjs-0-9-1' 
* origin/topic/awelzel/bump-zeekjs-0-9-1:
  Update ZeekJS submodule to 0.9.1
 2023-05-26 20:52:15 +02:00
Arne Welzel
c202686cd1 Merge remote-tracking branch 'origin/topic/awelzel/src-cmakelists-zeek-config-skip-version-h' 
* origin/topic/awelzel/src-cmakelists-zeek-config-skip-version-h:
  CMakeLists: Skip zeek-version.h include for zeek_objs, too
 2023-05-26 10:03:48 +02:00
Tim Wojtulewicz
9f8f7f5471 Merge remote-tracking branch 'origin/topic/timw/minor-windows-warning' 
* origin/topic/timw/minor-windows-warning:
  Fix minor type-clash warning on Windows
 2023-05-25 19:49:41 -07:00
Arne Welzel
3f3df93ac1 Merge remote-tracking branch 'origin/topic/timw/2914-truncated-tunnel-plus-things' 
* origin/topic/timw/2914-truncated-tunnel-plus-things:
  Address wire/capture length feedback
  packet_analysis/TCP: Do not use untrusted len for DeliverPacket()
  Add regression test using pcap from GH-2683
  Add btest to test Geneve->VXLAN->Truncated inner packet
  IP: Update packet->len with accumulated fragment size
  UDP: Forward any remaining data (also empty) to session-analysis
  IPTunnel: Compute inner wire length based on cap_len differences.
  IP: fix weird name to not be ipv6 specific
  UDP: don't validate checksum if caplen < len
  PIA: Modernize how struct initialization is done
 2023-05-25 20:19:20 +02:00
Tim Wojtulewicz
2bf0ebae32 Merge remote-tracking branch 'origin/topic/awelzel/auto-hilti-cxx-compiler-launcher-in-btest' 
* origin/topic/awelzel/auto-hilti-cxx-compiler-launcher-in-btest:
  btest.cfg: Set HILTI_CXX_COMPILER_LAUNCHER based on build/CMakeCache.txt
 2023-05-25 09:03:49 -07:00
Tim Wojtulewicz
540e0c8da8 Merge remote-tracking branch 'origin/topic/bbannier/spicy-test-speedup' 
* origin/topic/bbannier/spicy-test-speedup:
  Speed up Spicy-related tests.
 2023-05-25 09:03:22 -07:00
Arne Welzel
8967e347df Merge remote-tracking branch 'origin/topic/awelzel/telemetry-net-lag' 
* origin/topic/awelzel/telemetry-net-lag:
  stats: Add zeek-net-packet-lag-seconds metric
 2023-05-24 09:58:00 +02:00
Arne Welzel
f6fb0aca87 Merge remote-tracking branch 'origin/topic/awelzel/ci-tumbleweed-disable-openh264-repo' 
* origin/topic/awelzel/ci-tumbleweed-disable-openh264-repo:
  ci: Disable openh264 repository on tumbleweed
 2023-05-23 19:32:32 +02:00
Arne Welzel
af00ffec24 Merge remote-tracking branch 'origin/topic/robin/cmake-spicy-link-fix' 
* origin/topic/robin/cmake-spicy-link-fix:
  Bump cmake to fix build of multiple Spicy analyzers in a package.
 2023-05-23 17:35:48 +02:00
Arne Welzel
b2c22f0dcf Merge remote-tracking branch 'origin/topic/bbannier/issue-3071' 
* origin/topic/bbannier/issue-3071:
  Fix crashing when disable_analyzer() called on root analyzers
 2023-05-23 15:45:48 +02:00
Tim Wojtulewicz
614f1a9e5f Merge remote-tracking branch 'origin/topic/timw/further-cmake-fixes' 
* origin/topic/timw/further-cmake-fixes:
  Revert part of previous CMake debug type fix
 2023-05-22 16:39:07 -07:00
Tim Wojtulewicz
120ea779cb Merge remote-tracking branch 'origin/topic/awelzel/3053-fix-raw-reread-mode' 
* origin/topic/awelzel/3053-fix-raw-reread-mode:
  btest/input/raw: Fix reread test
  input/Raw: Avoid reading file twice in MODE_REREAD
 2023-05-22 16:34:17 -07:00
Arne Welzel
3b28f59c3b Merge remote-tracking branch 'origin/topic/christian/gh-3061-fix-cmake-build-type-lower' 
* origin/topic/christian/gh-3061-fix-cmake-build-type-lower:
  Fix CMAKE_BUILD_TYPE_LOWER definition-vs-use ordering problem
 2023-05-22 10:14:52 +02:00
Tim Wojtulewicz
222f604452 Merge remote-tracking branch 'origin/topic/neverlord/allow-find-zeek-in-plugins' 
* origin/topic/neverlord/allow-find-zeek-in-plugins:
  Allow plugins to call find_package(Zeek)
 2023-05-19 10:51:45 -07:00
Arne Welzel
d4c99e7c3f files: Warn once for missing get_file_handle() 
Repeating the message for every new call to get_file_handle() is not
very useful. It's pretty much an analyzer configuration issue so logging
it once should be enough.
 2023-05-19 09:37:51 -07:00
Tim Wojtulewicz
d4eb71ab8f Merge remote-tracking branch 'origin/topic/robin/spicy-search-path-fix' 
* origin/topic/robin/spicy-search-path-fix:
  Fix CMake ordering issue leaving configuration paths unset.
 2023-05-18 08:54:56 -07:00
Arne Welzel
b8a088d6f0 Merge remote-tracking branch 'origin/topic/awelzel/install-spicyz-config-h' 
* origin/topic/awelzel/install-spicyz-config-h:
  Add license header to zeek-config*.h and zeek-version.h
  Rename util-config.h to zeek-config-paths.h and install it
  Ensure spicyz/config.h is installed
 2023-05-17 16:11:15 +02:00
Robin Sommer
f14bfa63cf
Merge remote-tracking branch 'origin/topic/robin/spicy-path-fixes' 
* origin/topic/robin/spicy-path-fixes:
  Introduce environment variables to override more paths configured into `spicyz`.
  Fix an ordering issue in Spicy support's CMake config.
 2023-05-17 12:50:26 +02:00
Arne Welzel
c2a07476cc Merge remote-tracking branch 'jgras/topic/jgras/cluster-active-node-count-fix' 
* jgras/topic/jgras/cluster-active-node-count-fix:
  Fix get_active_node_count for node types not present.

Changed over to explicit existence check instead to avoid the set()
creation upon missed lookups.
 2023-05-17 10:37:00 +02:00
Arne Welzel
2bd1ae9c92 Merge remote-tracking branch 'origin/topic/awelzel/zeekygen-param-doc-field' 
* origin/topic/awelzel/zeekygen-param-doc-field:
  Bump doc submodule
  zeekygen: Render function parameters as :param x: instead of ❌
 2023-05-17 09:03:27 +02:00