Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 09:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
15389 commits 387 branches 195 tags 259 MiB
Commit graph

15389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vern Paxson
06522c0264 support in ScriptFunc class for ZVal-oriented vector of captures 2023-06-30 09:36:14 +02:00
Vern Paxson
6ac348d77d simplifications to the Frame class now that it no longer has to support old-style captures 2023-06-30 09:36:14 +02:00
Vern Paxson
82588ca311 use Ingredients directly for constructing functions 2023-06-30 09:36:14 +02:00
Vern Paxson
b6464814c9 the "Capture" struct is now a class 2023-06-30 09:36:14 +02:00
Vern Paxson
528aa6766a more debugging information when dumping script optimization data structures 2023-06-30 09:36:14 +02:00
Vern Paxson
4a5a7f975d bug fixes for script optimization intermediate forms 2023-06-30 09:36:14 +02:00
Vern Paxson
c0f3403714 clarifying comments, interface tightening 2023-06-30 09:36:14 +02:00
Vern Paxson
1505fd4aa1 added some class accessors/set-ers 2023-06-30 09:36:14 +02:00
zeek-bot
8389fc85d7 Update doc submodule [nomail] [skip ci] 2023-06-30 00:34:03 +00: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
Arne Welzel
95529ef7c0 Add test with MUD example 
This came up as a use-case on GitHub showing the limitations of the
opinionated approach. Add it as an example.

Reference https://www.rfc-editor.org/rfc/rfc8520#section-9
 2023-06-29 15:57:52 +02:00
Arne Welzel
480d52ca1f from_json: Support function to normalize key names 
When a JSON document contains key names containing colons or other
special characters that are not valid in Zeek identifiers, from_json()
cannot be used to parse such input.

This change allows a customizable normalization function.

Closes #3142.
 2023-06-29 15:57:49 +02:00
Arne Welzel
3a8b299c35 Update cmake submodule [nomail] 2023-06-29 14:38: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
Tim Wojtulewicz
999e7d2380 Merge remote-tracking branch 'origin/topic/awelzel/3143-no-more-zeekurity' into release/6.0 
* origin/topic/awelzel/3143-no-more-zeekurity:
  cirrus: Stop pushing container images to zeekurity

(cherry picked from commit 6a033d5aed)
 2023-06-27 09:34:15 -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
Benjamin Bannier
c718f7f632 Prefer Spicy include directories of this build over accidental ones. 
Closes #3153.
 2023-06-27 14:45:44 +02:00
progmboy
74c553c72e fix http AUTHORIZATION base64 decode failed 2023-06-27 19:25:32 +08:00
Tim Wojtulewicz
25da02fe50 Move CMake template files to separate directory 2023-06-26 13:39:59 -07:00
zeek-bot
64ebdec438 Update doc submodule [nomail] [skip ci] 2023-06-23 00:23:49 +00: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
zeek-bot
e56e14f879 Update doc submodule [nomail] [skip ci] 2023-06-22 00:19:16 +00:00
Tim Wojtulewicz
87081a728c Update zeekjs submodule 2023-06-21 15:36:48 -07:00
Tim Wojtulewicz
6278c81b08 Update broker submodule 2023-06-21 15:34:37 -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
Arne Welzel
0b317aced3 telemetry: Disable metrics centralization by default 
Move the telemetry/cluster.zeek file over into policy/frameworks/telemetry/prometheus.zeek.

Mention it in local.zeek.

Relates to zeek/broker#366.
 2023-06-21 20:13:55 +02:00
Johanna Amann
d8b3a0277c GSSAPI: basic support for MIC/WRAP tokens 
When MIC/WRAP tokens are encountered, we now skip the message, instead
of raising a parse error. The data in the messages is encrypted - so it
does not seem work to raise an event at the moment.
 2023-06-21 13:59:47 +01: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
7e9daea82b CI: Force rebuild of tumbleweed VM to pick up newer version of python 
The version of python included in the existing VM doesn't have the sqlite
module included for some reason. Forcing the VM to rebuild installs python311
which does include it, fixing a build failure.
 2023-06-20 09:59:35 -07:00
Arne Welzel
d892cac58c formatters/JSON: Make JSON::NullDoubleWriter use zeek::json::detail version 
Not using inheritance and preferring composition to avoid including the
detail/json.h header do an indirection via a unique_ptr and then just
re-use the Double() implementation.
 2023-06-17 14:11:18 +02:00
Arne Welzel
7c3b5553d8 formatters/JSON: Remove surrounding_braces 
This seems to have become unused 4 years ago with 9b76e8faf4,
remove it.
 2023-06-17 13:48:25 +02:00
Arne Welzel
6efc696179 formatters/JSON: Prepare to remove rapidjson from installed Zeek headers 
threading/formatters/JSON.h currently includes rapidjson headers for declaring
the NullDoubleWriter. This appears mostly an internal detail, but
results in the situation that 1) we need to ship rapidjson headers with
the Zeek install tree and 2) taking care that external plugins are able
to find these headers should they include formatters/JSON.h.

There are currently no other Zeek headers that include rapidjson, so this
seems very unfortunate and self-inflicted given it's not actually required.

Attempt to hide this implementation detail with the goal to remove the
rapidjson includes with v7.1 and then also stop bundling and exposing
the include path to external plugins.

The NullDoubleWriter implementation moves into a new formatters/detail/json.h
header which is not installed.

Closes #3128
 2023-06-17 13:48:25 +02:00
Arne Welzel
8550c691bd Stmt/Assert: Use std::move() for backtrace element 2023-06-16 12:45:39 +02:00
Arne Welzel
e22b1f85aa Update cmake submodule [nomail] 2023-06-16 09:36:28 +02: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
24f184fd8a Update external testing hashes for 6.1 deprecation changes 2023-06-15 19:45:05 -07:00
Tim Wojtulewicz
c45015bcb7 Remove leftover baseline files from 6.1 deprecation removal 2023-06-15 19:45:05 -07:00
zeek-bot
65e09f579a Update doc submodule [nomail] [skip ci] 2023-06-16 00:40:00 +00: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
3ad0bee7a2 Update external testing repo hashes to current master commits 2023-06-15 16:27:17 -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
1be1b1e6de Update dce-rpc constants 2023-06-15 15:08:56 -07:00
Vern Paxson
18be4ba91b -O gen-C++ refinements for BiF failures, negative vector indices, boolean vector operations 2023-06-15 15:07:18 -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
aff1ea0814 Update docs submodule [nomail] [skip ci] 2023-06-15 12:27:35 -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
Tim Wojtulewicz
62382e6cb9 Force -std=c++17 mode for plugin targets, remove use of RequireCXX17.cmake 2023-06-15 09:51:32 -07:00
Arne Welzel
f3b306a2ec Merge remote-tracking branch 'origin/topic/robin/spicy-news' 
* origin/topic/robin/spicy-news:
  Add Spicy updates to NEWS for 6.0.
 2023-06-15 18:42:44 +02:00