Commit graph

14386 commits

Author SHA1 Message Date
Arne Welzel
13b0e7a2aa docker: Extend tests to run a very basic Zeek script
Mostly because a `-v` shortcuts quite, while a zeek -e 'print zeek_version()'
will also parse all base scripts, etc.
2023-02-01 20:54:09 +01:00
Arne Welzel
7efd9ad1f5 cirrus: No broker-tests and no cpp-tests for images 2023-02-01 20:54:09 +01:00
Arne Welzel
4523f678d2 docker: Update Makefile/README to align with the Cirrus CI setup 2023-02-01 20:54:05 +01:00
Arne Welzel
44c19086e8 cirrus: Add back testing of container images 2023-02-01 20:54:05 +01:00
Tim Wojtulewicz
0fd335f7f0 Merge remote-tracking branch 'security/topic/timw/131-smb-fscontrol-overflow'
* security/topic/timw/131-smb-fscontrol-overflow:
  Restore/rename field in SMB2::Fscontrol record type
2023-02-01 10:48:16 -07:00
Tim Wojtulewicz
f33c697d6c Merge remote-tracking branch 'security/topic/awelzel/127-http-timeout-again'
* security/topic/awelzel/127-http-timeout-again:
  testing/http: http-11-request-then-cruft
  testing/http: Add pcap extracted from m5-long external test-suite
  testing/external: m57-long baseline update
  analyzers/http: Update request_version on subsequent SetVersion() calls
2023-02-01 10:47:54 -07:00
Tim Wojtulewicz
9a0dc30e35 Merge remote-tracking branch 'security/topic/awelzel/125-ftp-timeout-three'
* security/topic/awelzel/125-ftp-timeout-three:
  testing/ftp: Add tests and pcaps with invalid reply lines
  ftp: Harden reply handing a bit and don't raise bad replies to script-land
  ftp: ignore invalid commands
2023-02-01 10:47:32 -07:00
Robin Sommer
a2dfd3922f
Merge remote-tracking branch 'origin/topic/robin/zeek-spicy-infra'
* origin/topic/robin/zeek-spicy-infra:
  Switch to shared Spicy libraries by default.
  Provide infrastructure to migrate legacy analyzers to Spicy.
  Extend Zeekygen manager with method to check if it's active.
2023-02-01 11:48:27 +01:00
Robin Sommer
2512fd1e68
Switch to shared Spicy libraries by default.
This should work now. It affects only the toolchain libraries
`libhilti`/`libspicy`. the runtime libraries `libhilti-rt` and
`libspicy-rt` are always built static (but they are small). Zeek
itself doesn't link against the toolchain anymore now anyways, but a
number of the Spicy tools do.

Note, we have an issue with Broker I believe: it looks like it always
overrides BUILD_SHARED_LIBS to `OFF`

Addresses #2675.
2023-02-01 11:33:48 +01:00
Robin Sommer
04a1ead978
Provide infrastructure to migrate legacy analyzers to Spicy.
As initial examples, this branch ports the Syslog and Finger analyzers
over. We leave the old analyzers in place for now and activate them
iff we compile without any Spicy.

Needs `zeek-spicy-infra` branches in `spicy/`, `spicy-plugin/`,
`CMake/`, and `zeek/zeek-testing-private`.

Note that the analyzer events remain associated with the Spicy plugin
for now: that's where they will show up with `-NN`, and also inside
the Zeekygen documentation.

We switch CMake over to linking the runtime library into the plugin,
vs. at the top-level through object libraries.
2023-02-01 11:33:48 +01:00
Robin Sommer
283bea346b
Extend Zeekygen manager with method to check if it's active. 2023-02-01 11:31:33 +01:00
Arne Welzel
cfd9979044 Merge remote-tracking branch 'origin/topic/awelzel/2674-arm64-containers-on-cirrus'
* origin/topic/awelzel/2674-arm64-containers-on-cirrus:
  cirrus/containers: Do not install btest pcaps
  cirrus: Replace curl with _cache
  cirrus: Add cluster testing
  cirrus: Polish container_image_manifest_docker_builder
  cirrus: Use ccache for faster container builds
  cirrus: Add docker_builder tasks to build and push images
  github: No more docker workflow
2023-02-01 09:02:33 +01:00
Arne Welzel
20cc5541e0 cirrus/containers: Do not install btest pcaps 2023-02-01 08:52:05 +01:00
Arne Welzel
3f7adbe6b8 cirrus: Replace curl with _cache 2023-02-01 08:52:05 +01:00
Arne Welzel
5a611d4bdb cirrus: Add cluster testing 2023-02-01 08:52:05 +01:00
Arne Welzel
b5dc4c6617 cirrus: Polish container_image_manifest_docker_builder 2023-02-01 08:52:05 +01:00
Arne Welzel
7651c46314 cirrus: Use ccache for faster container builds 2023-02-01 08:52:05 +01:00
Arne Welzel
5510b2496a cirrus: Add docker_builder tasks to build and push images 2023-02-01 08:52:05 +01:00
Arne Welzel
f9b0681c98 github: No more docker workflow 2023-02-01 08:52:05 +01:00
zeek-bot
f3eb7cc0c1 Update doc submodule [nomail] [skip ci] 2023-02-01 00:41:31 +00:00
Tim Wojtulewicz
9f1ac1e3ab Updating submodule(s) [nomail] 2023-01-31 09:22:59 -07:00
Arne Welzel
87d6efafb0 Merge branch 'topic/awelzel/mysql-start-tls'
* topic/awelzel/mysql-start-tls:
  mysql: Recognize when client/server negotiate SSL
2023-01-31 14:49:56 +01:00
Arne Welzel
be44c642e1 Merge remote-tracking branch 'origin/topic/awelzel/move-disabling-analyzer-out-of-global'
* origin/topic/awelzel/move-disabling-analyzer-out-of-global:
  analyzer: Move disabling_analyzer() hook into Analyzer module
2023-01-31 14:48:56 +01:00
Arne Welzel
023daf4ba8 Merge remote-tracking branch 'origin/topic/awelzel/topic/awelzel/argument-mismatch-with-error'
* origin/topic/awelzel/topic/awelzel/argument-mismatch-with-error:
  Skip somer error reporting when the record type has errors
2023-01-31 14:47:19 +01:00
zeek-bot
9239d315d2 Update doc submodule [nomail] [skip ci] 2023-01-31 00:38:29 +00:00
Tim Wojtulewicz
b18a2aafa3 Remove comment about osx-sysroot [nomail] [skip ci] 2023-01-30 15:41:37 -07:00
Tim Wojtulewicz
903fbbc5d6 Merge remote-tracking branch 'origin/topic/timw/remove-osx-sysroot'
* origin/topic/timw/remove-osx-sysroot:
  Remove setting osx-sysroot on macOS CI builds
2023-01-30 13:39:09 -07:00
Tim Wojtulewicz
b437ca13f4 Remove setting osx-sysroot on macOS CI builds 2023-01-30 11:57:34 -07:00
Tim Wojtulewicz
9f50a72213 Merge remote-tracking branch 'origin/topic/timw/5.2-NEWS-updates'
* origin/topic/timw/5.2-NEWS-updates:
  Whitespace cleanup in 5.2 NEWS block
  Updates to the NEWS for upcoming release/5.2 branching
2023-01-30 09:19:33 -07:00
Tim Wojtulewicz
9ae108efee Whitespace cleanup in 5.2 NEWS block 2023-01-30 09:18:40 -07:00
Tim Wojtulewicz
52a43ef878 Updates to the NEWS for upcoming release/5.2 branching 2023-01-30 09:18:38 -07:00
Arne Welzel
03e5ac3078 Merge branch 'topic/awelzel/topic/awelzel/2698-sqlite-backend-options'
* topic/awelzel/topic/awelzel/2698-sqlite-backend-options:
  broker/store: Extend SQLiteOptions around data safety and performance
  auxil/broker: Bump submodule
2023-01-30 11:06:27 +01:00
Arne Welzel
f35cf228dc broker/store: Extend SQLiteOptions around data safety and performance
Add configurability of synchronous and journal_mode for SQLite backed
Broker data stores. Setting these to synchronous=normal and journal_mode=wal
can significantly improve throughput at the cost of some durability in
the presence of power loss or OS crash. In the context of Zeek, this is
likely more than acceptable.

Additionally, add integrity_check and failure_mode options to support deleting
and re-opening a corrupted SQLite database at store creation.

Closes #2698
2023-01-30 10:25:37 +01:00
Arne Welzel
b720f71e5e auxil/broker: Bump submodule 2023-01-30 10:25:33 +01:00
Tim Wojtulewicz
a1b003a9e2 Merge remote-tracking branch 'origin/topic/timw/enable-debian10-prs'
* origin/topic/timw/enable-debian10-prs:
  Enable Debian 10 builds for PRs
2023-01-28 09:47:05 -07:00
Tim Wojtulewicz
4c3bd8b4a6 Enable Debian 10 builds for PRs 2023-01-28 09:25:28 -07:00
Tim Wojtulewicz
c6af2b2a8b Merge remote-tracking branch 'origin/topic/timw/update-smb1-test-pcap'
* origin/topic/timw/update-smb1-test-pcap:
  Update smb1-OSS-fuzz-54883.pcap to have correct snaplen
2023-01-28 08:52:44 -07:00
Tim Wojtulewicz
48a7a6a0fb Update smb1-OSS-fuzz-54883.pcap to have correct snaplen 2023-01-28 08:19:05 -07:00
Arne Welzel
d54b465409 ci-notification: No notifications for "skipped" runs [skip ci]
It is not useful to receive email notifications for CI runs
that were skipped.
2023-01-28 15:12:07 +01:00
Tim Wojtulewicz
84ac362c67 Restore/rename field in SMB2::Fscontrol record type
b41a4bf06d removed a field from this record
because it had a duplicate name as another field. The field does need to
exist, but it needs the correct name.
2023-01-27 17:39:10 -07:00
zeek-bot
3a4a6fad08 Update doc submodule [nomail] [skip ci] 2023-01-28 00:33:36 +00:00
Tim Wojtulewicz
bb094e30bf Merge remote-tracking branch 'origin/topic/awelzel/2726-smb1-expr-error-with-tree-connect-response'
* origin/topic/awelzel/2726-smb1-expr-error-with-tree-connect-response:
  smb1: Prevent accessing uninitialized referenced_tree
2023-01-27 13:25:08 -07:00
Tim Wojtulewicz
3648ded80e Merge remote-tracking branch 'origin/topic/neverlord/broker-submodule-bump'
* origin/topic/neverlord/broker-submodule-bump:
  Update Broker submodule
2023-01-27 13:23:48 -07:00
Tim Wojtulewicz
3216817d89 Merge remote-tracking branch 'origin/topic/timw/pvs-studio-findings'
* origin/topic/timw/pvs-studio-findings:
  Add tooling section to README
  A bunch of other minor issues reported by PVS-Studio
  Simplify setup of IPv6 DNS resolvers
  Add missing assignment operators to RobustDictIterator
  Fix some member-variable shadowing issues
  Fix/simplify some if statement comparisons
  Fix a few minor int pointer value initializations
  Fix a bunch of missing class member initializations
  Remove unnecessary virtual specifiers from final classes
2023-01-27 13:23:23 -07:00
Tim Wojtulewicz
467e0a27a7 Add tooling section to README 2023-01-27 13:03:52 -07:00
Tim Wojtulewicz
35ee96c4cb A bunch of other minor issues reported by PVS-Studio 2023-01-27 13:03:52 -07:00
Tim Wojtulewicz
53f2364a86 Simplify setup of IPv6 DNS resolvers 2023-01-27 13:03:52 -07:00
Tim Wojtulewicz
34f7c95a51 Add missing assignment operators to RobustDictIterator 2023-01-27 13:03:52 -07:00
Tim Wojtulewicz
4cdd68f019 Fix some member-variable shadowing issues 2023-01-27 13:03:19 -07:00
Tim Wojtulewicz
5bfd84a903 Fix/simplify some if statement comparisons 2023-01-27 13:03:19 -07:00