Commit graph

15268 commits

Author SHA1 Message Date
Arne Welzel
8ee9b3c9e4 Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-doctest-defines'
* origin/topic/awelzel/3090-propagate-doctest-defines:
  Options: Do not output full usage on --test error
  CMakeLists: Propagate DOCTEST defines to external plugins

(cherry picked from commit 2fddddbf51)
2023-06-15 13:03:08 -07:00
Arne Welzel
413610b5c0 Merge remote-tracking branch 'origin/topic/awelzel/3090-add-back-rapidjson'
* origin/topic/awelzel/3090-add-back-rapidjson:
  CMakeLists: Add rapidjson/include to zeek_dynamic_plugin_base

(cherry picked from commit 1d6585e1a0)
2023-06-15 13:03:00 -07:00
Arne Welzel
ac63f727f7 Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-build-type'
* origin/topic/awelzel/3090-propagate-build-type:
  ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE

(cherry picked from commit 2eeba959fe)
2023-06-15 13:02:41 -07:00
Tim Wojtulewicz
97ac6471b7 Update docs submodule [nomail] [skip ci] 2023-06-15 12:31:41 -07:00
Tim Wojtulewicz
00c0f2a7cf Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' into release/6.0
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to latest release.
2023-06-14 10:23:35 -07:00
Tim Wojtulewicz
646468c89a Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' into release/6.0
* origin/topic/bbannier/bump-spicy:
  Bump `auxil/spicy`.
2023-06-14 09:27:13 -07:00
Benjamin Bannier
d94ca50d0b Bump Spicy to latest release. 2023-06-14 13:33:30 +02:00
Tim Wojtulewicz
17a7cfe005 Updating CHANGES and VERSION. 2023-06-12 15:55:19 -07:00
Tim Wojtulewicz
c82b42c8dd Update docs submodule for 6.0-rc2 [nomail] [skip ci] 2023-06-12 15:45:49 -07:00
Tim Wojtulewicz
37db4a0412 Update broker submodule [nomail] 2023-06-12 14:25:34 -07:00
Tim Wojtulewicz
d8a56ee8b4 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.

(cherry picked from commit 27575df917)
2023-06-12 11:23:42 -07:00
Tim Wojtulewicz
d2b534e6b2 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() )

(cherry picked from commit 98e44ee14f)
2023-06-12 11:23:01 -07:00
Tim Wojtulewicz
b34e70e6cd 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

(cherry picked from commit c389d9804b)
2023-06-12 11:01:14 -07:00
Arne Welzel
e41a5c3a93 ci/windows: choco --localonly is gone
choco 2.0 is now used after some caching changes on the Cirrus side [1]
and the --localonly flag is gone from choco [2], remove its usage.

[1] https://github.com/cirruslabs/cirrus-ci-docs/issues/1174#issuecomment-1580928673
[2] https://docs.chocolatey.org/en-us/guides/upgrading-to-chocolatey-v2-v6#the-list-command-now-lists-local-packages-only-and-the-local-only-and-lo-options-have-been-removed

(cherry picked from commit 528e27e542)
2023-06-09 13:44:11 +02:00
Benjamin Bannier
bef857e68c Bump auxil/spicy. 2023-06-09 12:51:16 +02:00
Tim Wojtulewicz
0f017ac45b Update link to slack in README.md 2023-06-05 14:18:38 +02:00
Tim Wojtulewicz
037bceaf1b Updating CHANGES and VERSION. 2023-05-31 13:42:35 +02:00
Tim Wojtulewicz
e39f953b33 Update broker submodule to 2.6.0 release tag [nomail] [skip ci] 2023-05-31 12:05:27 +02:00
Tim Wojtulewicz
9d8511395d Update docs submodule [nomail] [skip ci] 2023-05-31 11:20:48 +02:00
Tim Wojtulewicz
3a0efb296f Updating CHANGES and VERSION. 2023-05-31 09:51:22 +02:00
Tim Wojtulewicz
1cfe0e3ee7 Merge remote-tracking branch 'origin/topic/bbannier/issue-3094'
* origin/topic/bbannier/issue-3094:
  Simplify code generated for Spicy analyzer port ranges.
2023-05-31 09:50:46 +02:00
Tim Wojtulewicz
7ebcbcd174 Update baseline for coverage.test-all-policy-cluster test 2023-05-31 00:40:30 -07:00
Arne Welzel
737ac43942 catch-and-release: Mark cr_check_rule as is_used 2023-05-31 00:37:38 -07:00
Arne Welzel
aceb023301 Add test-all-policy-cluster
After the introduction of @if ... analyze, a lot of warnings were
triggered due to nested @if and @if .. analyze usage.

Add a test for coverage of all policy scripts in cluster mode
for the usual node types so this does not happen again.
2023-05-31 00:37:30 -07: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
Robin Sommer
cfbb7eb8ee
Merge remote-tracking branch 'origin/topic/robin/gh-3083-export-fix'
* origin/topic/robin/gh-3083-export-fix:
  Register test analyzer only for required ports.
  Fix disappearing unit fields in Spicy type export.
2023-05-30 14:59:00 +02:00
Benjamin Bannier
dc735371be Simplify code generated for Spicy analyzer port ranges.
We previously would reprent port ranges from EVT files element-wise.
This can potentially generate a lot of code (all on a single line
though) which some versions of GCC seem to have trouble with, and which
also causes JIT overhead.

With this patch we switch to directly representing ranges. Single ports
are represented as ranges `[start, start]`.

Closes #3094.
2023-05-29 12:20:44 +02:00
Benjamin Bannier
0b100c1e1c Register test analyzer only for required ports.
This is a workaround for #3094.
2023-05-28 17:36:06 +02:00
zeek-bot
49e2f482b4 Update doc submodule [nomail] [skip ci] 2023-05-27 00:41:39 +00: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
Tim Wojtulewicz
3ac28ba5a2 Merge remote-tracking branch 'origin/topic/timw/update-broker'
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
2023-05-26 12:31:12 -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
Tim Wojtulewicz
8ae477c32d Update broker submodule [nomail] 2023-05-26 11:15:14 -07:00
Arne Welzel
6ac7a9e62a Update ZeekJS submodule to 0.9.1 2023-05-26 19:07:11 +02:00
Robin Sommer
fd86d8530b
Fix disappearing unit fields in Spicy type export.
When a Spicy unit type was used in an EVT event definition, it could
end up being cleared out at the time the logic for `export` got to see it.

Closes #3083.

Note: This needs backporting to the legacy plugin.
2023-05-26 11:37:23 +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
Arne Welzel
c61f0d776f Bump cluster testsuite to latest main 2023-05-26 10:02:46 +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
Vern Paxson
e441ba394a updates reflecting review comments 2023-05-25 18:00:13 -07:00
Tim Wojtulewicz
75188ea6d7 Fix minor type-clash warning on Windows 2023-05-25 16:50:22 -07:00
Tim Wojtulewicz
496d2bc5e3 Fix Coverity warning involving object copy in TLS binpac code 2023-05-25 13:39:51 -07:00
Arne Welzel
4ef019a637 CMakeLists: Skip zeek-version.h include for zeek_objs, too
I've continued to see somewhat slower builds after Zeek version bumps. It
appears files covered by zeek_objs didn't have -DZEEK_CONFIG_SKIP_VERSION_H
set causing ccache invalidation after a version bump.
2023-05-25 20:54:33 +02: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
Benjamin Bannier
8049d3a002 Speed up Spicy-related tests.
This patch changes invocations of `spicyz` and similar Spicy tools in
tests which perform compilation to use debug mode via passing `-d`. This
in turn leads to Spicy compiling generated C++ code in debug as opposed
to release mode which typically seems to require less CPU time and RAM.
For a local test running with `btest -j 16` and no caching via
`HILTI_CXX_COMPILER_LAUNCER` this sped up running of BTests under
`spicy/` by about 40s on my machine (120s vs 160s).
2023-05-25 14:59:10 +02:00
Arne Welzel
b9803e157b btest.cfg: Set HILTI_CXX_COMPILER_LAUNCHER based on build/CMakeCache.txt
If CMakeCache.txt indicates the Zeek build was done with ccache,
take the CCACHE_PROGRAM:FILEPATH= line and populate the
HILTI_CXX_COMPILER_LAUNCHER environment.

For local development with ccache, this speeds up the spicy tests
significantly after the initial run without knowing or needing know
that setting HILTI_CXX_COMPILER_LAUNCHER would've helped.
2023-05-25 13:42:12 +02:00
Arne Welzel
c4d159d1ff Address wire/capture length feedback 2023-05-25 09:48:14 +02:00
zeek-bot
7e356cfd31 Update doc submodule [nomail] [skip ci] 2023-05-25 00:32:57 +00:00
Tim Wojtulewicz
0e3780d983 Update docs submodule [nomail] 2023-05-24 12:11:10 -07:00