Commit graph

13262 commits

Author SHA1 Message Date
FlyingWithJerome
d5a6896171 add svcb test case 2021-10-12 17:43:32 -04:00
FlyingWithJerome
ca4b181d35 add a dns https test case 2021-10-12 17:43:32 -04:00
FlyingWithJerome
8f7f75fcb4 remove test logs 2021-10-12 17:43:32 -04:00
FlyingWithJerome
0849332eb9 fix a few syntax errors 2021-10-12 17:43:32 -04:00
FlyingWithJerome
8fce51bf83 initial commit for SVCB/HTTPS records 2021-10-12 17:43:32 -04:00
Christian Kreibich
4d48272adb Bump zkg to 2.12.0 [nomail] [skip ci] 2021-10-12 14:05:47 -07:00
Tim Wojtulewicz
aedacf2a6c Merge remote-tracking branch 'origin/topic/timw/modernize-typedef'
* origin/topic/timw/modernize-typedef:
  Replace most uses of typedef with using for type aliasing
2021-10-12 09:23:00 -07:00
Tim Wojtulewicz
64748edab1 Replace most uses of typedef with using for type aliasing 2021-10-11 14:51:10 -07:00
Christian Kreibich
7101f30646 Merge branch 'topic/christian/ci-tweaks-freebsd-testsuite'
* topic/christian/ci-tweaks-freebsd-testsuite:
  Don't initialize private testsuite in CI when not running out of Zeek project
  Drop FreeBSD 11.4 (now EOL), add FreeBSD 14 as informational build
2021-10-11 11:39:24 -07:00
Christian Kreibich
e95494953f Update doc submodule [nomail] [skip ci] 2021-10-11 11:13:47 -07:00
Christian Kreibich
b66e607e5f Don't initialize private testsuite in CI when not running out of Zeek project
The initialization of the private testsuite currently fails builds run in
forks. Cirrus's encrypted variables won't work outsize of the Zeek project, so
skip that setting altogether.
2021-10-05 12:37:02 -07:00
Christian Kreibich
f269b2ef91 Drop FreeBSD 11.4 (now EOL), add FreeBSD 14 as informational build 2021-10-05 10:47:03 -07:00
Christian Kreibich
d1c6e9e226 Merge branch 'topic/christian/complex-indices'
* topic/christian/complex-indices:
  Expand table/set tests to cover new index types
  Expression tweaks to get complex types to work as container indices
  Whitespace tweak in a btest, no other change
2021-10-04 12:48:51 -07:00
Christian Kreibich
dbdd07b93f Merge branch 'topic/christian/docker-tweaks'
* topic/christian/docker-tweaks:
  Enable customization of the Docker image's configure invocation
  Add Python Broker module load test to Docker image btests
  Set PYTHONPATH in Docker to automatically find Zeek's modules
  Docker image fix: libpython needs to be 3.9 on Debian Bullseye
2021-10-01 14:20:09 -07:00
Christian Kreibich
a8ab977b0e Expand table/set tests to cover new index types 2021-10-01 14:03:08 -07:00
Christian Kreibich
175d9297e3 Expression tweaks to get complex types to work as container indices 2021-10-01 14:03:08 -07:00
Christian Kreibich
b7603faf3d Whitespace tweak in a btest, no other change 2021-10-01 14:03:08 -07:00
Christian Kreibich
0e5e01f65f Merge branch 'topic/christian/bump-highwayhash'
* topic/christian/bump-highwayhash:
  CI tweak: upgrade curl on FreeBSD to avoid cert expiration
  CI tweak: add a datestamp to Debian 9 Dockerfiles to invalidate Cirrus build cache
  Bump highwayhash submodule to pull in another FreeBSD header fix
2021-10-01 13:29:28 -07:00
Christian Kreibich
eadb8648e6 CI tweak: upgrade curl on FreeBSD to avoid cert expiration 2021-10-01 11:56:27 -07:00
Christian Kreibich
9eb2696895 CI tweak: add a datestamp to Debian 9 Dockerfiles to invalidate Cirrus build cache 2021-10-01 11:56:24 -07:00
Christian Kreibich
acde4d1765 Bump highwayhash submodule to pull in another FreeBSD header fix 2021-09-30 10:39:43 -07:00
Christian Kreibich
946e4f8a42 Enable customization of the Docker image's configure invocation 2021-09-30 08:41:21 -07:00
Christian Kreibich
ee58cb5785 Add Python Broker module load test to Docker image btests
We missed the fact that the broker module didn't load due to a wrong libpython
version because we didn't test that load.

Also remove an unused environment variable from btest.cfg.
2021-09-30 08:41:21 -07:00
Christian Kreibich
25f86d1d7f Set PYTHONPATH in Docker to automatically find Zeek's modules 2021-09-30 08:41:21 -07:00
Christian Kreibich
eaa39a489f Docker image fix: libpython needs to be 3.9 on Debian Bullseye 2021-09-30 08:41:20 -07:00
zeek-bot
9aadc7e42a Update doc submodule [nomail] [skip ci] 2021-09-29 00:36:58 +00:00
Tim Wojtulewicz
d85d20b7f6 Merge remote-tracking branch 'origin/topic/timw/1766-remove-zero-address'
* origin/topic/timw/1766-remove-zero-address:
  GHI-1766: Remove address from Site::private_address_space that converts into 0.0.0.0/0
2021-09-28 10:05:01 -07:00
Tim Wojtulewicz
0f348ea042 GHI-1766: Remove address from Site::private_address_space that converts into 0.0.0.0/0 2021-09-27 14:24:14 -07:00
Tim Wojtulewicz
ff98515f2a Merge remote-tracking branch 'origin/topic/timw/clang-format-fixes'
* origin/topic/timw/clang-format-fixes:
  clang-format: Set penalty for breaking after assignment operator
  clang-format: Set IndentCaseBlocks to false
  clang-format: Other minor formatting changes
  clang-format: Other include ordering changes
  clang-format: Enforce ordering of includes in ZBody
  clang-format: A few minor comment-spacing fixes
  clang-format: Force zeek-config.h to be earlier in the config ordering
2021-09-27 12:07:21 -07:00
Tim Wojtulewicz
9af6b2f48d clang-format: Set penalty for breaking after assignment operator 2021-09-27 10:49:48 -07:00
Tim Wojtulewicz
4423574d26 clang-format: Set IndentCaseBlocks to false 2021-09-27 10:49:48 -07:00
Tim Wojtulewicz
02206f3215 clang-format: Other minor formatting changes 2021-09-27 10:49:48 -07:00
Tim Wojtulewicz
e97c14add5 clang-format: Other include ordering changes 2021-09-27 10:49:48 -07:00
Robin Sommer
c8f48385c1 Update doc submodule. 2021-09-27 14:06:01 +02:00
Christian Kreibich
94f5c0333f Merge branch 'topic/christian/oh-come-on'
* topic/christian/oh-come-on:
  Fix space issue in docker tag computation
2021-09-26 10:27:34 -07:00
Christian Kreibich
2734db2941 Fix space issue in docker tag computation
This fixes image uploads in the Github action introduced in ddae1398f1.

Co-authored-by: Benjamin Bannier <benjamin.bannier@corelight.com>
2021-09-26 10:22:59 -07:00
Tim Wojtulewicz
cb99ae2b7c clang-format: Enforce ordering of includes in ZBody 2021-09-25 11:52:55 -07:00
Tim Wojtulewicz
07e276ab2e clang-format: A few minor comment-spacing fixes 2021-09-25 11:52:55 -07:00
Tim Wojtulewicz
9cb54f5d44 clang-format: Force zeek-config.h to be earlier in the config ordering 2021-09-25 11:52:55 -07:00
Tim Wojtulewicz
016ac0f199 Merge remote-tracking branch 'origin/topic/timw/damnit-homebrew'
* origin/topic/timw/damnit-homebrew:
  Fixing homebrew, again.
2021-09-25 11:47:56 -07:00
Tim Wojtulewicz
dc4e273153 Fixing homebrew, again.
Homebrew apparently requires you to now specify the version of the package
you're updating. We previously could just run `brew update openssl` and it
would work. Now we must run `brew update openssl@1.1` for the command to
succeed.
2021-09-25 11:45:22 -07:00
Christian Kreibich
fc96f6a147 Merge branch 'topic/christian/fix-docker-doublebuild'
* topic/christian/fix-docker-doublebuild:
  Add .dockerignore to suppress btest artifacts
2021-09-24 20:49:35 -07:00
Christian Kreibich
3bd9748289 Add .dockerignore to suppress btest artifacts
We run btest in CI between image build and upload, and since its artifacts
weren't suppressed, the discrepancy caused the Dockerfile COPY to cache-miss.
2021-09-24 17:04:26 -07:00
Christian Kreibich
b5e9488389 Merge branch 'topic/bbannier/issue-1625'
* topic/bbannier/issue-1625:
  Switch published container image to debian:bullseye-slim
  Test container with BTest instead of container-structure-tests
  Add a minimal containerized environment
2021-09-24 11:15:35 -07:00
Tim Wojtulewicz
e5b163290d Merge remote-tracking branch 'origin/topic/vern/remove-uu'
* origin/topic/vern/remove-uu:
  fix up for linking w/ doc update
  documentation update
  script simplification that removes an unnecessary &is_assigned
  removing -uu functionality and associated script analysis now no longer needed
2021-09-24 10:31:56 -07:00
Benjamin Bannier
2db1ebb2a2 Switch published container image to debian:bullseye-slim 2021-09-24 11:48:49 +02:00
Christian Kreibich
d6c80f6d2c Test container with BTest instead of container-structure-tests
This patch replaces the container-strucuture-tests for the Zeek
container with a BTest-driven approach to provide a more familiar
experience. In addtion to `python3` for `btest` we also rely on `make`
being available in Github-hosted runners which at least currently seems
to be hold (probably pulled in as a dependency of CMake which is
officially included, see
https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md).
2021-09-24 11:48:49 +02:00
Benjamin Bannier
ddae1398f1 Add a minimal containerized environment
This patch adds a minimal Zeek environment packaged as a container.
Since this is intended both as a base layer for other images and as a
quick way to explore Zeek we install only zeek and zkg as basic
functionality.

Closes #1625.
2021-09-24 11:48:19 +02:00
zeek-bot
f50df2dda6 Update doc submodule [nomail] [skip ci] 2021-09-24 00:36:09 +00:00
Robin Sommer
dd5d6e1756 Merge branch 'topic/foxds/dcerpc_auth' of ssh://github.com/fox-ds/zeek
* 'topic/foxds/dcerpc_auth' of ssh://github.com/fox-ds/zeek:
  Fix protocol forwarding in dce_rpc-auth
  Fix protocol forwarding in dce_rpc-auth
2021-09-23 17:50:00 +02:00