Commit graph

16194 commits

Author SHA1 Message Date
Tim Wojtulewicz
5fa606ec01 Update .gitignore to add Emacs and Vim temp files 2024-02-07 12:12:58 -07:00
Tim Wojtulewicz
2426cef41c Update vcpkg submodule to pull in c-ares 1.26.0 to match other platforms 2024-02-07 12:12:58 -07:00
Christian Kreibich
1f2821dfe3 Merge branch 'topic/christian/news-additions'
* topic/christian/news-additions:
  Some NEWS updates for 6.2 [skip ci]
2024-02-07 09:36:36 -08:00
Arne Welzel
fa97e08f60 Merge remote-tracking branch 'origin/topic/awelzel/websocket-spicy-analyzer'
* origin/topic/awelzel/websocket-spicy-analyzer:
  websocket: Implement Spicy's unmask in C++
  websocket: Add Spicy parser version, too.
2024-02-07 13:15:59 +01:00
Arne Welzel
bd26d41d6b websocket: Implement Spicy's unmask in C++
This improves runtime for the test pcap I have from 22 seconds to
12 seconds, about 1.8x times faster.
2024-02-07 12:47:24 +01:00
Christian Kreibich
2e66faba76 Some NEWS updates for 6.2 [skip ci] 2024-02-06 17:38:07 -08:00
zeek-bot
26a5ebe246 Update doc submodule [nomail] [skip ci] 2024-02-07 00:26:16 +00:00
Arne Welzel
c1a685a05d websocket: Add Spicy parser version, too.
The Spicy analyzer is added as a child analyzer when enabled and the
WebSocket.cc logic dispatches between the BinPac and Spicy version.

It substantially slower when tested against a somewhat artificial
2.4GB PCAP. The first flamegraph indicates that the unmask() function
stands out with 35% of all samples, and above it shared_ptr samples.
2024-02-06 17:29:55 +01:00
Johanna Amann
160ccda45f Merge remote-tracking branch 'origin/topic/johanna/netcontrol-updates'
* origin/topic/johanna/netcontrol-updates:
  Netcontrol: add rule_added_policy
  Netcontrol: more logging in catch-and-release
  Netcontrol: allow supplying explicit name to Debug plugin
2024-02-06 11:54:26 +00:00
Arne Welzel
f8a7f3699c Merge remote-tracking branch 'origin/topic/vern/complete-ast-locs'
* origin/topic/vern/complete-ast-locs:
  Obj: Implement with_location_of() as template
  fixes & enhancements to location information associated w/ AST nodes & ZAM optimization
2024-02-06 11:22:58 +01:00
Arne Welzel
caa1c7493f Obj: Implement with_location_of() as template 2024-02-06 11:03:06 +01:00
Vern Paxson
e5bb63c662 fixes & enhancements to location information associated w/ AST nodes & ZAM optimization 2024-02-06 11:03:02 +01:00
Arne Welzel
7a283afe00 Merge remote-tracking branch 'origin/topic/christian/cluster-pool-nodetype-default'
* origin/topic/christian/cluster-pool-nodetype-default:
  Do not default PoolSpec topics to the empty string.
  Do not default to proxy nodes in Broker::PoolSpec
2024-02-06 10:11:45 +01:00
Arne Welzel
ee5579c40a Merge remote-tracking branch 'origin/topic/timw/fix-alpine-ci-image'
* origin/topic/timw/fix-alpine-ci-image:
  Add missing include for int32_t in DebugCmds.h
  CI: Remove emacs backup file of fedora-38 Dockerfile
  CI: Fix building of alpine image with regards to python packages
2024-02-06 09:55:21 +01:00
Christian Kreibich
873d734c79 Do not default PoolSpec topics to the empty string.
Similar to `node_topic`, we already spell out a topic in the existing use and
there's no obviously meaningful default value.
2024-02-05 18:03:08 -08:00
Christian Kreibich
8437012346 Do not default to proxy nodes in Broker::PoolSpec
This requires pool creation to spell out a spec explicitly, which the only code
using these types already does. There's no reason for pools to automatically
refer to proxies.
2024-02-05 17:51:11 -08:00
Christian Kreibich
42f0a10cb0 Bump cluster testsuite to latest main [skip ci] 2024-02-05 17:19:38 -08:00
Tim Wojtulewicz
01d11d6c0b Add missing include for int32_t in DebugCmds.h 2024-02-05 14:38:16 -07:00
Tim Wojtulewicz
60da270800 CI: Remove emacs backup file of fedora-38 Dockerfile 2024-02-05 13:33:52 -07:00
Tim Wojtulewicz
2736e8e527 CI: Fix building of alpine image with regards to python packages 2024-02-05 13:32:19 -07:00
Tim Wojtulewicz
4e589121c8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Feb24'
* origin/topic/vern/script-opt-maint.Feb24:
  minor updates and fixes for script optimization maintenance
2024-02-05 12:51:01 -07:00
Johanna Amann
737f828bcb Netcontrol: add rule_added_policy
rule_added_policy allows the modification of rules just after they have
been added. This allows the implementation of some more complex features
- like changing rule states depending on insertion in other plugins.
2024-02-05 18:52:27 +00:00
Johanna Amann
979d43eac0 Netcontrol: more logging in catch-and-release
Catch-and-release logs now include the plugin that is responsible for an
action. Furthermore, the catch-and-release log also includes instances
where a rule already existed, and where an error occurred during an
operation.
2024-02-05 14:38:21 +00:00
Vern Paxson
9e32443504 minor updates and fixes for script optimization maintenance 2024-02-04 07:57:45 -08:00
zeek-bot
50c674b670 Update doc submodule [nomail] [skip ci] 2024-02-04 00:14:18 +00:00
Johanna Amann
2df520414e Netcontrol: allow supplying explicit name to Debug plugin
This change extends the arguments of NetControl::create_debug, and
allows the specification of an optional name argument, which can be used
instead of the default-generated name.

This is helpful when one wants to attach several plugins to verify
behavior in those cases.
2024-02-03 18:14:29 +00:00
zeek-bot
e521526cba Update doc submodule [nomail] [skip ci] 2024-02-03 00:14:08 +00:00
Tim Wojtulewicz
9609f1fe1a Merge branch 'topic/timw/vcpkg'
* topic/timw/vcpkg:
  Fix searching for libpcap installed by vcpkg
  Switch all of the conan configuration to vcpkg
2024-02-02 15:27:40 -07:00
Tim Wojtulewicz
a610b8488d Fix searching for libpcap installed by vcpkg 2024-02-02 14:52:16 -07:00
Tim Wojtulewicz
674816a01d Switch all of the conan configuration to vcpkg 2024-02-02 14:52:16 -07:00
Christian Kreibich
9da9d0d7a8 Merge branch 'topic/christian/docs-fix'
* topic/christian/docs-fix:
  Fix markup typo in the Intel::seen_policy hook docstring [skip ci]
2024-02-02 13:50:20 -08:00
Christian Kreibich
2cbc41a70c Fix markup typo in the Intel::seen_policy hook docstring [skip ci] 2024-02-02 12:30:39 -08:00
Tim Wojtulewicz
104116e782 Merge remote-tracking branch 'origin/topic/timw/update-c-ares'
* origin/topic/timw/update-c-ares:
  Configure c-ares before libkqueue
  Update 3rdparty submodule to update sqlite to 3.45.0
  Upgrade rapidjson to current upstream master
  Upgrade c-ares to 1.26.0
2024-02-01 11:22:18 -07:00
Tim Wojtulewicz
9cabff1da6 Configure c-ares before libkqueue
On platforms without a native libkqueue, c-ares is using the existing
value for HAVE_KQUEUE that was set during the libkqueue setup. We don't
pass the libkqueue information down to the c-ares cmake run so it won't
have the paths or library when it builds.
2024-02-01 10:06:28 -07:00
Tim Wojtulewicz
4e6faea8fe Update 3rdparty submodule to update sqlite to 3.45.0 2024-01-31 10:45:45 -07:00
Tim Wojtulewicz
ad712d65de Upgrade rapidjson to current upstream master 2024-01-31 10:45:45 -07:00
Tim Wojtulewicz
4c864beeec Upgrade c-ares to 1.26.0 2024-01-31 10:45:45 -07:00
Arne Welzel
072fe660bc Merge remote-tracking branch 'origin/topic/awelzel/spicy-diff-remove-timestamps-fix'
* origin/topic/awelzel/spicy-diff-remove-timestamps-fix:
  spicy/diff-remove-timestamp: Fix missing -e
2024-01-31 14:27:59 +01:00
Arne Welzel
3f7d225cee spicy/diff-remove-timestamp: Fix missing -e
This got lost when converting to sed -E.
2024-01-31 14:06:32 +01:00
zeek-bot
86c91a6ec9 Update doc submodule [nomail] [skip ci] 2024-01-31 00:15:04 +00:00
Arne Welzel
42d05d2e09 Merge remote-tracking branch 'origin/topic/awelzel/fix-server-initial-with-ack'
* origin/topic/awelzel/fix-server-initial-with-ack:
  quic: Log client's source connection id, too.
  quic: Continue decryption attempts for later INITIAL packets
  quic: Rename set_conn() to set_session()
2024-01-30 21:47:16 +01:00
Arne Welzel
1c516f738c quic: Log client's source connection id, too.
Seem reasonable give we log the server SCID. Interestingly, the Chromium
examples actually have zero length (empty) source connection IDs. I wonder
if that's part of their "protocol ossification avoidance" effort.
2024-01-30 21:46:38 +01:00
Arne Welzel
33acfdc630 quic: Continue decryption attempts for later INITIAL packets
The original logic stopped decrypting any INITIAL packets after the
first. The Firefox/cloudflare pcaps actually show that the server
replies with a QUIC INITAL packet containing just ACK frames and no
CRYPTO frames. Only the second QUIC INITIAL packet from the server
then contains the CRYPTO frames.

There's no good reason to stop decryption attempts, either we succeed
down the road and then stop, or we fail and raise analyzer violations.
2024-01-30 21:46:38 +01:00
Arne Welzel
ac524b4a33 quic: Rename set_conn() to set_session()
set_conn() should be about the c$conn record. Most other base scripts
for protocols use set_session(), so do the same.
2024-01-30 21:46:38 +01:00
Robin Sommer
5c3bb6cd97
Merge remote-tracking branch 'origin/topic/robin/bump-spicy'
* origin/topic/robin/bump-spicy:
  Bump Spicy to current `main`.
2024-01-29 10:30:43 +01:00
Robin Sommer
1837e0289a
Bump Spicy to current main.
This requires a few baseline updates, and a tweak to one test
canonifier.
2024-01-29 09:59:46 +01:00
Christian Kreibich
318f8295ea Merge branch 'topic/christian/mmdb-fix'
* topic/christian/mmdb-fix:
  Move GeoIP availability test in btests to `zeek-config --have-geoip`
  Fix MMDB::Lookup() to check result status correctly
  Add btest for succeeding/failing IPv4/IPv6 lookups
  Add an IPv6 range to the test MMDB DBs
2024-01-26 17:14:18 -08:00
Christian Kreibich
173f5e7137 Move GeoIP availability test in btests to zeek-config --have-geoip 2024-01-26 14:27:19 -08:00
Tim Wojtulewicz
5efaae0a7e Merge remote-tracking branch 'origin/topic/timw/windows-openssl-version'
* origin/topic/timw/windows-openssl-version:
  Force Windows CI to use OpenSSL 3.1.1
2024-01-26 15:08:47 -07:00
Tim Wojtulewicz
5a7c482a0f Force Windows CI to use OpenSSL 3.1.1
There's something wrong with chocolatey's OpenSSL 3.2.0 package that
causes cmake to not be able to find libcrypto even though it's clearly
in the directory. Pinning to 3.1.1 fixes the build issue.
2024-01-26 13:10:51 -07:00