Commit graph

15378 commits

Author SHA1 Message Date
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
461f6b59d1 Updating submodule(s) [nomail] 2023-07-05 13:22:33 -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
Benjamin Bannier
47c549790c Bump Spicy to latest release.
This is the `master` branch companion patch for `release/6.0`'s
d6ad7f56c5.

Closes #3101.
2023-07-05 18:22:53 +02:00
Tim Wojtulewicz
0b217e0e76 Updating CHANGES and VERSION. 2023-07-05 08:34:17 -07:00
Tim Wojtulewicz
f3a16b8660 Merge remote-tracking branch 'origin/topic/timw/funsigned-char-build'
* origin/topic/timw/funsigned-char-build:
  Update binpac, bifcl, and broker submodules for funsigned-char change
  Add /J flag on Windows to force unsigned char
  Use -funsigned-char flag when building Zeek
2023-07-05 08:33:36 -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
4cde1c3c3f global_ids(): Include module names
Ad-hoc include module names in the global_ids() table. Table values will
have the type_name field set to "module" and their key in the table is
prefixed with "module " to avoid clashes with existing global identifiers
shadowing module names (Management::Node being an existing example).

Closes #3136
2023-07-05 14:09:20 +02:00
Robin Sommer
a3e170093d
Set SPICY_BUILD_DIRECTORY in zeek-path-dev.
Having this set allows running Spicy tests from inside
`auxil/spicy/tests`.
2023-07-05 11:32:34 +02:00
Arne Welzel
cbdeb4abf2 Update dump-events baseline, not running with OpenSSL 3 2023-07-05 10:25:14 +02:00
Arne Welzel
a2214ad611 Conn: In-place val flip and connection_flipped()
Avoids loosing state on a connection value when a connection is flipped.

Fixes up the NTP baseline as well where this was visible: analyzer_confirmation_info()
was raised for a connection value which was immediately forgotten due to
the subsequent connection flipping.

Closed #3028
2023-07-04 20:01:17 +02:00
Arne Welzel
640bd4e065 Conn: Remove is_version_sep()
Leftover from 2655a65331.
2023-07-04 17:58:46 +02:00
Arne Welzel
0d6174a5d6 Remove icmp_conn leftovers
Roughly 2.5 years ago all events taking the ``icmp_conn`` parameter were
removed with 44ad614094 and the NetVar.cc
type not populated anymore.

Remove the left-overs in script land, too.
2023-07-04 17:57:20 +02:00
Tim Wojtulewicz
e10e12e256 Update binpac, bifcl, and broker submodules for funsigned-char change 2023-07-02 14:56:45 -07:00
Tim Wojtulewicz
d5e2531b2f Add /J flag on Windows to force unsigned char 2023-06-30 13:48:24 -07:00
Tim Wojtulewicz
df80e344b7 Use -funsigned-char flag when building Zeek 2023-06-30 13:48:22 -07:00
Tim Wojtulewicz
f6f9dd2620 Update package-manager submodule [nomail] 2023-06-30 13:31:23 -07:00
Arne Welzel
123dfafc56 Update zeekjs submodule to 0.9.4 2023-06-30 17:32:59 +02:00
Arne Welzel
23e9928ca2 dce-rpc: Test cases for unbounded state growth
Pcaps produced as shown in #3145 using a samba container and rpcclient.
2023-06-30 15:14:35 +02:00
Arne Welzel
097b7a2e96 dce-rpc: Handle smb2_close_request() in scripts
If there's a request to close a fid and it's in the dce_rpc_backing
table, remove it from there.
2023-06-30 15:14:35 +02:00
Arne Welzel
6517ed94f2 smb/dce-rpc: Cleanup DCE-RPC analyzers when fid is closed and limit them
This patch does two things:

1) For SMB close requests, tear down any associated DCE-RPC
   analyzer if one exists.

2) Protect from fid_to_analyzer_map growing unbounded by introducing a
   new SMB::max_dce_rpc_analyzers limit and forcefully wipe the
   analyzers if exceeded. Propagate this to script land as event
   smb_discarded_dce_rpc_analyzers() for additional cleanup.

This is mostly to fix how the binpac SMB analyzer tracks individual
DCE-RPC analyzers per open fid. Connections that re-open the same or
different pipe may currently allocate unbounded number of analyzers.

Closes #3145.
2023-06-30 15:14:32 +02:00
Arne Welzel
1c9038f38d dce-rpc: Do not repeatedly register removal hooks
...once should be enough.
2023-06-30 14:32:49 +02:00
Arne Welzel
ccfc68fccd Fixup external hashes modified during merge 2023-06-30 11:53: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
Vern Paxson
ed828ec92b documentation updates 2023-06-30 09:59:29 +02:00
Vern Paxson
bd30baf42f updates to ZAM-specific BTest baseline 2023-06-30 09:59:29 +02:00
Vern Paxson
cb15e0d4f1 Address PR review feedback on zam-feature-complete
* insert_or_assign usage
  * master -> primary
  * FunctionIngredientsPtr
  * FuncType::Capture deprecations
  * no new ScriptFunc constructor
2023-06-30 09:59:10 +02:00
Vern Paxson
46d3526b40 Updates to BTest baselines due to previous BTest tweaks 2023-06-30 09:36:14 +02:00
Vern Paxson
a4cf10e34d tweaks to BTests for ZAM feature completeness; new ZAM-only btest 2023-06-30 09:36:14 +02:00
Vern Paxson
b6b4a81e0d removal of unused functionality and some follow-on simplifications 2023-06-30 09:36:14 +02:00
Vern Paxson
ecc93606c4 feature completeness for ZAM 2023-06-30 09:36:14 +02:00
Vern Paxson
65a7e3de5f -O gen-C++ tweaks to be compatible with ZAM changes 2023-06-30 09:36:14 +02:00
Vern Paxson
d89b39a0bb ZAM support for "when" statements 2023-06-30 09:36:14 +02:00
Vern Paxson
558cec58ed ZAM changes intermixed with lambda and "when" support 2023-06-30 09:36:14 +02:00
Vern Paxson
1dd2270272 WhenStmt/WhenInfo restructuring in support of ZAM "when" statements 2023-06-30 09:36:14 +02:00
Vern Paxson
7d5760ac74 ZAM support for lambdas 2023-06-30 09:36:14 +02:00
Vern Paxson
0a40aec4a6 ZAM internals have a notion of "captures" as global-like variables 2023-06-30 09:36:14 +02:00
Vern Paxson
110ba7a0a1 AST profiling enhnacements in support of script optimization for lambdas/whens 2023-06-30 09:36:14 +02:00
Vern Paxson
46983cfb2f refinements to LambdaExpr's to provide flexibility, support for ZVal captures 2023-06-30 09:36:14 +02:00
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