Commit graph

13262 commits

Author SHA1 Message Date
Tim Wojtulewicz
7990986c01 Enable 'greedy' mode for other CI builds 2022-05-19 09:21:55 -07:00
Tim Wojtulewicz
d48a1b520f Enable ccache for Cirrus builds 2022-05-19 09:21:55 -07:00
Johanna Amann
4d1b9f4a08 Merge remote-tracking branch 'origin/topic/johanna/centos-9-stream-openssl'
* origin/topic/johanna/centos-9-stream-openssl:
  Fix SSL tests on Centos Stream 9
2022-05-19 17:14:04 +01:00
Tim Wojtulewicz
ee85595e48 Merge remote-tracking branch 'origin/topic/timw/disable-spicy-for-coverity-builds'
* origin/topic/timw/disable-spicy-for-coverity-builds:
  Disable Spicy in Zeek Coverity builds
2022-05-19 09:13:25 -07:00
Johanna Amann
4d66e4e16c Fix SSL tests on Centos Stream 9
SHA1 signatures are only allowed in the legacy policy. I have no idea
where this is documented - I found it in a patch for the OpenSSL source
package.

Also adding tar as a specific dependency, since we have a test that
requires it, and at least for me it was not present in a minimal
installation.

Fixes #2115
2022-05-19 15:00:12 +01:00
Tim Wojtulewicz
1223386fd3 Merge remote-tracking branch 'origin/topic/bbannier/spicy-helper-scripts'
* origin/topic/bbannier/spicy-helper-scripts:
  Always generate helper scripts for Spicy.
2022-05-18 11:12:08 -07:00
Tim Wojtulewicz
840a57b458 Merge remote-tracking branch 'origin/topic/johanna/openssl-3-fips'
* origin/topic/johanna/openssl-3-fips:
  Partially revert OpenSSL hashing changes
2022-05-18 11:07:40 -07:00
Tim Wojtulewicz
327eca32fd Merge remote-tracking branch 'origin/topic/timw/1672-table-expiration-deletion'
* origin/topic/timw/1672-table-expiration-deletion:
  GH-1672: Keep a reference to a table being expired, just in case
2022-05-18 11:07:13 -07:00
Tim Wojtulewicz
2416f832a2 Disable Spicy in Zeek Coverity builds 2022-05-18 11:06:27 -07:00
Benjamin Bannier
c68cfd8d8e Always generate helper scripts for Spicy.
We previously only generated these files if configuring a build which
included Spicy. This meant that e.g., `zeek-path-dev.*` scripts would
emit errors for non-existing paths if Spicy was not included.

We now always generate the helper scripts so we can reference them
regardless of build configuration. If Spicy is not included the files
will still be sourced, but have no actual effect.
2022-05-18 09:49:09 +02:00
zeek-bot
da9148f535 Update doc submodule [nomail] [skip ci] 2022-05-18 00:36:09 +00:00
Tim Wojtulewicz
92a7773dd5 Merge remote-tracking branch 'origin/topic/timw/unneeded-fmt'
* origin/topic/timw/unneeded-fmt:
  Remove unnecessary uses of util::fmt()
2022-05-17 09:15:37 -07:00
Tim Wojtulewicz
aaaca5d5a6 Merge remote-tracking branch 'origin/topic/bbannier/spicy'
* origin/topic/bbannier/spicy:
  Add NEWS item for new requirements due to default-enabled Spicy support.
  Include headers in binary dir before other headers.
  Increase memory in CI.
  Add tests for bundled Spicy infrastructure.
  Include spicy in build.
  Add `bare_mode` bif.
  Change test so included plugins can load notice framework.
  Do not log function arguments in test.
2022-05-17 08:50:33 -07:00
Johanna Amann
30167d659a Partially revert OpenSSL hashing changes
This commit partially reverts the changes that we made in
6217851d6d. It turns out that reverting to
the legacy OpenSSL API means that Zeek can no longer be run in FIPS mode
for old (but still used) versions of OpenSSL.

This commit thus uses a bunch of #ifdefs to support both implementations
simultaneously.
2022-05-17 08:52:06 +00:00
Tim Wojtulewicz
3233400930 Merge remote-tracking branch 'origin/topic/timw/1857-input-log-messages'
* origin/topic/timw/1857-input-log-messages:
  Move some repetitive code into a separate method
  Store location during Ascii input parsing for use in error messages
  Include file information in input reader error messages
2022-05-16 17:00:34 -07:00
Tim Wojtulewicz
3d133ccb0a Merge remote-tracking branch 'origin/topic/vern/CPP-feature-complete'
* origin/topic/vern/CPP-feature-complete:
  NEWS items for script profiling, "footprint" BiFs, and Trigger method deprecations
  tweaks per reviewing feedback
  make deprecation advice a bit more helpful
  format shell scripts per style guide
  add deprecation for Trigger Cache/Lookup interfaces
  helper scripts for -O C++ maintenance
  "-O use-C++" now fails if no C++ bodies wound up being applicable
  update environemnt variable names to match command-line arguments
  final changes for -O C++ feature completeness, mainly "when" statement support
  Change "when" statements that don't require closures to use new implementation. Provide hooks for script optimization access to "when" statements. Regularize treatment of naming and timeouts for Triggers.
  switch cached Trigger values to be opaque-and-generic, rather than assuming CallExpr's
  tracking of when statements/expressions occur in a "when" context
  fix bug that sometimes associated the wrong location with global statements
  fix incomplete AST traversal of "when" statements
  add some missing "when" closures
  regularize test suite names to avoid custom/outdated suffices
2022-05-16 16:59:59 -07:00
Tim Wojtulewicz
b8ca68f548 GH-1672: Keep a reference to a table being expired, just in case 2022-05-16 15:33:54 -07:00
Tim Wojtulewicz
d73f9a78dd Remove unnecessary uses of util::fmt() 2022-05-16 13:49:04 -07:00
Tim Wojtulewicz
f4461d5e95 Move some repetitive code into a separate method 2022-05-16 13:15:06 -07:00
Tim Wojtulewicz
ec50b66ff3 Store location during Ascii input parsing for use in error messages 2022-05-16 13:15:06 -07:00
Tim Wojtulewicz
098a5d3348 Include file information in input reader error messages 2022-05-16 13:15:06 -07:00
Tim Wojtulewicz
8184073ef8 Merge remote-tracking branch 'origin/topic/timw/fix-freebsd-14-pip'
* origin/topic/timw/fix-freebsd-14-pip:
  Call pip using python -m flag during FreeBSD CI prep
2022-05-16 13:14:43 -07:00
Tim Wojtulewicz
031036be9c Call pip using python -m flag during FreeBSD CI prep 2022-05-16 11:55:40 -07:00
Tim Wojtulewicz
5c34c777bd Merge remote-tracking branch 'origin/topic/timw/1797-string-allocations'
* origin/topic/timw/1797-string-allocations:
  Store hash analyzer kind StringVals for later reuse
  Add Component::GetCanonicalNameVal to avoid extra StringVal allocations
  Avoid type unnecessary type conversion in ComponentManager::GetComponentName
  Only set connection history if strings differ
2022-05-16 09:11:06 -07:00
Tim Wojtulewicz
6268baed35 Merge remote-tracking branch 'origin/topic/timw/script-profile-move-operator'
* origin/topic/timw/script-profile-move-operator:
  Explicitly define copy and move operators/constructors for ScriptProfileStats
2022-05-16 09:10:30 -07:00
Tim Wojtulewicz
1d20e28e5c Merge remote-tracking branch 'origin/topic/timw/retry-update-traces'
* origin/topic/timw/retry-update-traces:
  Add --retry to curl invocations in update-traces
2022-05-16 09:09:47 -07:00
Tim Wojtulewicz
55297a2e73 Merge remote-tracking branch 'origin/topic/timw/2103-bifs-footprint-leak'
* origin/topic/timw/2103-bifs-footprint-leak:
  GH-2103: Disable leak detection for bifs.footprint in another way
2022-05-16 09:09:17 -07:00
Benjamin Bannier
fde8908384 Add NEWS item for new requirements due to default-enabled Spicy support. 2022-05-16 09:16:21 +02:00
Benjamin Bannier
83b36dfc54 Include headers in binary dir before other headers.
If e.g., optional dependencies are installed in the same prefix as a
previous Zeek installation, the build would have previously found
`zeek-config.h` from the external prefix instead of from the current
build.

With this patch we now include the current binary dir before any
previously configured include directories (here in particular: optional
dependencies). With that the correct `zeek-config.h` is found.
2022-05-16 09:07:11 +02:00
Benjamin Bannier
52f0b68d86 Increase memory in CI.
Spicy requires substantial amounts of RAM to compile. In this patch we
bump the amount of RAM available in CI so a build including Spicy can be
performed.
2022-05-16 09:07:11 +02:00
Benjamin Bannier
e40aa0f6d2 Add tests for bundled Spicy infrastructure. 2022-05-16 09:07:11 +02:00
Benjamin Bannier
95aff9a1e3 Include spicy in build. 2022-05-16 09:07:11 +02:00
Benjamin Bannier
e83c4c834d Add bare_mode bif. 2022-05-16 09:07:11 +02:00
Benjamin Bannier
0f1dd8ef1b Change test so included plugins can load notice framework. 2022-05-16 09:07:11 +02:00
Benjamin Bannier
1e4f368c68 Do not log function arguments in test.
This was excercising hooks to validate that they were called. For that
it uses pretty verbose logging. Since version numbers are not stable and
hard to canonify this script already unloads the version module (there
is e.g., code in `base/misc/version` which splits the version strings
and works on single components which might appear like pretty ordinary
floating point numbers in the log).

This test however worked under the assumption that nothing in bare mode
loads `base/misc/version` which is hard to guarantee, especially
considering that plugins can be embedded and might load that module
themself.

With this patch we now make the logging slightly less verbose so that
function call arguments are not logged anymore.
2022-05-16 09:07:11 +02:00
Vern Paxson
7d00ce0082 speed up ZAM compilation by capping function size when inlining 2022-05-14 14:52:31 -07:00
zeek-bot
0c2f04548a Update doc submodule [nomail] [skip ci] 2022-05-14 00:40:58 +00:00
Tim Wojtulewicz
6cd3724747 Merge remote-tracking branch 'origin/topic/neverlord/gh-2084'
* origin/topic/neverlord/gh-2084:
  Fix formatting
  Fix UB during early shutdown on OpenSSL state
2022-05-13 16:51:05 -07:00
Tim Wojtulewicz
bd1ea5edda Merge remote-tracking branch 'origin/topic/johanna/bloomfilter'
* origin/topic/johanna/bloomfilter:
  Bloom filter changes: address review feedback
  Bloom-filter: fix documentation syntax problem
  Bloomfilter related clang-format fixes
  Correcly typify bloom filters in all cases during merge
  Add intersect operation for bloom filters
  Add bloomfilter_decrement bif
2022-05-13 16:49:13 -07:00
Vern Paxson
f510a6364f NEWS items for script profiling, "footprint" BiFs, and Trigger method deprecations 2022-05-13 16:45:36 -07:00
Tim Wojtulewicz
56fe393691 GH-2103: Disable leak detection for bifs.footprint in another way 2022-05-13 16:26:41 -07:00
Vern Paxson
702172079a tweaks per reviewing feedback 2022-05-13 16:16:21 -07:00
Tim Wojtulewicz
107f4fdc99 Add --retry to curl invocations in update-traces 2022-05-13 11:54:27 -07:00
Tim Wojtulewicz
aec2fbf7dc Explicitly define copy and move operators/constructors for ScriptProfileStats
Fixes Coverity 1488768
2022-05-13 11:08:12 -07:00
Vern Paxson
da72c1ea93 make deprecation advice a bit more helpful 2022-05-13 10:33:43 -07:00
Vern Paxson
a21d14fbd2 format shell scripts per style guide 2022-05-13 10:31:27 -07:00
Vern Paxson
5c3cc4fba8 add deprecation for Trigger Cache/Lookup interfaces 2022-05-12 14:38:30 -07:00
Vern Paxson
08fbc7efb3 helper scripts for -O C++ maintenance 2022-05-12 14:09:35 -07:00
Vern Paxson
fb6725a9ce "-O use-C++" now fails if no C++ bodies wound up being applicable 2022-05-12 14:08:54 -07:00
Vern Paxson
34b448ee7b update environemnt variable names to match command-line arguments 2022-05-12 14:08:17 -07:00