Commit graph

16055 commits

Author SHA1 Message Date
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
zeek-bot
2785e3f47d Update doc submodule [nomail] [skip ci] 2023-07-12 00:36:10 +00: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
f202073387 Merge remote-tracking branch 'origin/topic/vern/minor-modernization'
* origin/topic/vern/minor-modernization:
  removed use of unnecessary member variable accessors for StmtList methods
  migrated some raw pointers to smart pointers
2023-07-11 16:15:52 -07:00
Vern Paxson
fbdc5e3f29 removed use of unnecessary member variable accessors for StmtList methods 2023-07-11 16:04:30 -07:00
Vern Paxson
1b2cd0c767 migrated some raw pointers to smart pointers 2023-07-11 16:04:30 -07:00
Arne Welzel
da6ee8125d ci: Bust Ubuntu 22.10 image cache
Cirrus jobs failing to pull the image, try rebuilding.
2023-07-11 12:53:05 +02:00
Arne Welzel
12a5616f4d Support :: prefix to reference global namespace, deprecate GLOBAL::
Closes #2709
2023-07-11 12:51:21 +02: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
Tim Wojtulewicz
3dc21f6a50 Remove unused state_label() method from ssl analyzer binpac files 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
ec7ec2aa42 Mark some overridden functions with override keyword 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
64b78f6fb9 Use emplace_back over push_back where appropriate 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
0d78eb1933 packet_analysis: Define all plugin type as final 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
9de5d1e8d5 Use std::make_unique in one place instead of declaring unique_ptr directly 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
de13bb6361 Avoid unnecessary type names in return statements 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
4957dace64 Simplify type trait usage (remove ::value usage) 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
cd7ebdb2ed A handful of int-to-bool conversions 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
90d0bc64fa Replace empty destructor bodies with =default definitions 2023-07-07 09:17:05 -07:00
Tim Wojtulewicz
1991b87a07 Reduce amount of files passed to clang-tidy 2023-07-07 09:17:05 -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
Robin Sommer
65e5e739d0
[Spicy] Support switch fields when exporting Spicy types to Zeek.
Closes #3157.
2023-07-06 08:40:54 +02:00
zeek-bot
8424250200 Update doc submodule [nomail] [skip ci] 2023-07-06 00:50:02 +00:00
Vern Paxson
a1d25670fc Fix for nested "when" statements leading to confusion over scoping 2023-07-05 17:10:38 -07:00
Tim Wojtulewicz
efe4b35481 Define early_shutdown lambda earlier in zeek-setup, avoids build failure with gperftools 2023-07-05 14:08:09 -07: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
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