Commit graph

16609 commits

Author SHA1 Message Date
Benjamin Bannier
0500b30676 Bump external baselines 2024-06-19 11:20:58 +02:00
Benjamin Bannier
9a65a54ff5 Switch MIME mail content hashing to SHA1 2024-06-19 11:20:58 +02:00
Benjamin Bannier
27b9ef488f Skip tests in FIPS mode 2024-06-19 11:20:58 +02:00
Benjamin Bannier
35c2eb2de8 Use SHA1 for SSH key fingerprinting -- likely needs zeekygen docs update 2024-06-19 11:20:57 +02:00
Benjamin Bannier
3d3793efc6 Use SHA1 for KRB ticket hashing 2024-06-19 11:20:57 +02:00
Benjamin Bannier
2bfaab603d Remove unneeded test usage of md5
MD5 is not FIPS compliant and we do not need to use it in the majority
of tests. Replace them where not explicitly needed.

(cherry picked from commit 3291846ae8e13e05c6554d0029c25a99fd6b5a10)
2024-06-19 11:20:57 +02:00
Benjamin Bannier
85760614cc Switch seed initialization to use SHA1 instead of MD5 2024-06-19 11:20:57 +02:00
Benjamin Bannier
66616728d8 Add helper function to compute SHA1 hashes 2024-06-19 11:20:57 +02:00
Arne Welzel
a7f10df4f7 Merge remote-tracking branch 'origin/topic/christian/ci-updates'
* origin/topic/christian/ci-updates:
  CMakeLists: Disable -Werror for 3rdparty/sqlite3.c
  Bump zeek-3rdparty to pull in sqlite move to 3.46
  CI: drop Fedora 38, add 40
2024-06-18 10:53:09 +02:00
Arne Welzel
003d2d1468 CMakeLists: Disable -Werror for 3rdparty/sqlite3.c
We package vanilla sqlite from upstream and on Fedora 40 with sqlite 3.46
there's the following compiler warning:

    In function 'sqlite3Strlen30',
        inlined from 'sqlite3ColumnSetColl' at
        ../../src/3rdparty/sqlite3.c:122105:10:
        ../../src/3rdparty/sqlite3.c:35003:28: error: 'strlen' reading 1 or more bytes from a region of size 0 [-Werror=stringop-overread]
    35003 |   return 0x3fffffff & (int)strlen(z);
          |                            ^~~~~~~~~
    In function 'sqlite3ColumnSetColl':

Disabling -Werror on sqlite3.c seems sensible given we have little
control over that code.
2024-06-18 10:03:32 +02:00
Christian Kreibich
5af23757fa Bump zeek-3rdparty to pull in sqlite move to 3.46
This avoids a compiler warning/error on Fedora 40.
2024-06-17 18:45:43 -07:00
Christian Kreibich
59d0f311a5 CI: drop Fedora 38, add 40 2024-06-17 18:45:39 -07:00
Robin Sommer
8c755af8b2
Merge remote-tracking branch 'origin/topic/robin/gh-3783-replaces-two'
* origin/topic/robin/gh-3783-replaces-two:
  Spicy: Disallow repeating replacements of the same analyzer.
  Bump Spicy.
2024-06-14 13:51:06 +02:00
Robin Sommer
4318d5ab9e
Spicy: Disallow repeating replacements of the same analyzer.
We now reject EVT files that attempt to replace the same built-in
analyzer multiple times as doing so would be ill-defined and not very
intuitive in what exactly it means.

Closes #3783.
2024-06-14 13:10:47 +02:00
Robin Sommer
956e147f70
Bump Spicy. 2024-06-14 13:10:47 +02:00
Benjamin Bannier
345fc31dcc Merge remote-tracking branch 'origin/topic/bbannier/ci-centos8-stream-eol' 2024-06-11 15:11:52 +02:00
Benjamin Bannier
20eeb6dbf6 Drop EOL centos8-stream in CI 2024-06-11 14:48:35 +02:00
Arne Welzel
1e3b5ee68b Merge remote-tracking branch 'origin/topic/timw/civetweb-shutdown-data-race'
* origin/topic/timw/civetweb-shutdown-data-race:
  Suppress a known data race during civetweb shutdown
2024-06-11 12:01:10 +02:00
Arne Welzel
3081a40a2a Merge remote-tracking branch 'origin/topic/awelzel/asan-coverage-fixes'
* origin/topic/awelzel/asan-coverage-fixes:
  Bump cmake for -fprofile-update=atomic usage
  cirrus: Unset CCACHE_BASEDIR for asan/coverage build
2024-06-11 11:03:14 +02:00
Arne Welzel
8bf3d3c7fc Bump cmake for -fprofile-update=atomic usage 2024-06-11 08:58:21 +02:00
Arne Welzel
f228cf878a cirrus: Unset CCACHE_BASEDIR for asan/coverage build
When CCACHE_BASEDIR is set, ccache will rewrite absolute paths to
relative paths in order to allow compilation in different source
directories. We do not need this feature on Cirrus (the checkout
is always in /zeek) and using absolute paths avoids
confusion/normalization needs for the gcov -p results.

We could consider removing the global CCACHE_BASEDIR, but it'd
bust the ccache of every other task, too.
2024-06-11 08:56:46 +02:00
zeek-bot
d603653495 Update doc submodule [nomail] [skip ci] 2024-06-08 00:11:59 +00:00
Tim Wojtulewicz
753127be6d Suppress a known data race during civetweb shutdown 2024-06-07 11:31:34 -07:00
Tim Wojtulewicz
3f6b9ab167 Merge remote-tracking branch 'origin/topic/timw/telemetry-bind-address'
* origin/topic/timw/telemetry-bind-address:
  Add Telemetry::metrics_address option
2024-06-07 09:29:09 -07:00
Tim Wojtulewicz
d549e3d56a Add Telemetry::metrics_address option 2024-06-07 09:28:27 -07:00
Tim Wojtulewicz
322d223c18 Merge remote-tracking branch 'origin/topic/timw/pic-prometheus-cpp'
* origin/topic/timw/pic-prometheus-cpp:
  Update cmake submodule [nomail]
2024-06-06 18:23:59 -07:00
Tim Wojtulewicz
7a3a2606f0 Update cmake submodule [nomail] 2024-06-06 18:23:31 -07:00
Tim Wojtulewicz
2cb284a352 Merge remote-tracking branch 'origin/topic/timw/dont-require-jq'
* origin/topic/timw/dont-require-jq:
  Change prometheus test to check for require jq
2024-06-06 18:08:44 -07:00
Tim Wojtulewicz
16d39b9978 Merge remote-tracking branch 'origin/topic/timw/zeekctl-check-telemetry'
* origin/topic/timw/zeekctl-check-telemetry:
  Check for 'zeekctl check' before trying to start up prometheus
2024-06-06 18:07:02 -07:00
Tim Wojtulewicz
777b0be03e Check for 'zeekctl check' before trying to start up prometheus 2024-06-06 12:34:46 -07:00
Tim Wojtulewicz
c0f14bdc0b Change prometheus test to check for require jq 2024-06-06 08:53:48 -07:00
Tim Wojtulewicz
7ac703b97d Update cmake submodule [nomail] 2024-06-06 08:20:46 -07:00
zeek-bot
9eb39d6907 Update doc submodule [nomail] [skip ci] 2024-06-05 00:22:15 +00:00
Tim Wojtulewicz
66e3d8c2e4 Merge remote-tracking branch 'origin/topic/timw/telemetry-follow-up'
* origin/topic/timw/telemetry-follow-up:
  Switch to zeek fork of prometheus-cpp
  Remove unnecessary shared_from_this on instrument classes
  Restore label_names field in MetricOpts record
  Change how we count FDs on Linux to fix zeekctl stop issues
  Update zeekctl tests for telemetry rework
  Use forward declarations of prometheus-cpp types in telemetry::Manager
  Add prometheus-cpp files to install set for plugins to use
  Fix a memory leak with the CivetWeb callbacks in telemetry
  Fix a bunch of copy-instead-of-move findings from Coverity
  Move telmetry label names out of opts records, into main metric records
  Ensure the order of label values matches the label names
  Remove prefix column from telemetry.log
  Fix race condition by pre-building the cluster json data for services.json
  Set running_under_test for scripts.base.frameworks.logging.telemetry test
2024-06-04 14:17:05 -07:00
Tim Wojtulewicz
1aebe01e14 Switch to zeek fork of prometheus-cpp 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
2680bac480 Remove unnecessary shared_from_this on instrument classes 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
99e64aa113 Restore label_names field in MetricOpts record 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
1cdca7c1d0 Change how we count FDs on Linux to fix zeekctl stop issues 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
2d6c433dca Update zeekctl tests for telemetry rework 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
9d6ba594b9 Use forward declarations of prometheus-cpp types in telemetry::Manager 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
dd0814c804 Add prometheus-cpp files to install set for plugins to use 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
32fe94f0f8 Fix a memory leak with the CivetWeb callbacks in telemetry 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
65678fbfdb Fix a bunch of copy-instead-of-move findings from Coverity 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
433c257886 Move telmetry label names out of opts records, into main metric records 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
b1578d4ded Ensure the order of label values matches the label names 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
87717fed0a Remove prefix column from telemetry.log 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
f55c0a5292 Fix race condition by pre-building the cluster json data for services.json 2024-06-04 14:14:58 -07:00
Tim Wojtulewicz
00b24b043a Set running_under_test for scripts.base.frameworks.logging.telemetry test 2024-06-04 14:14:57 -07:00
Tim Wojtulewicz
07d845b558 Merge remote-tracking branch 'origin/topic/awelzel/stevesmoot-reporter-error-updates'
* origin/topic/awelzel/stevesmoot-reporter-error-updates:
  Update reporter.bif to describe special case of errors in init
2024-06-04 11:36:23 -07:00
Tim Wojtulewicz
e7b0a0a887 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Jun24'
* origin/topic/vern/script-opt-maint.Jun24:
  script optimization baseline tweaks due to recent minor changes
  updated list of BiFs for script optimization
  addressed some Coverity nits
  improved error cascade for invalid attributes
2024-06-04 10:36:57 -07:00