Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/btest: Remove spicy-quic helper, disable Spicy on CentOS 7

Browse source 
The have-quic pattern wasn't great and it wouldn't scale.
This commit is contained in:
Arne Welzel 2023-10-11 17:15:31 +02:00
parent e51d7815f2
commit 1774a25f00
20 changed files with 16 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -204,6 +204,8 @@ centos7_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR
env:
ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG
debian12_task: debian12_task:
container: container:

7
src/analyzer/protocol/quic/CMakeLists.txt
View file

@ -13,10 +13,3 @@ else ()
"Warning: QUIC analyzer unavailable - requires OpenSSL 1.1 or later (found ${OPENSSL_VERSION})" "Warning: QUIC analyzer unavailable - requires OpenSSL 1.1 or later (found ${OPENSSL_VERSION})"
) )
endif () endif ()
# Allow tests to introspect availability of the QUIC analyzer.
if (TARGET spicy_QUIC)
set(ZEEK_HAVE_ANALYZER_QUIC yes CACHE INTERNAL "Zeek has QUIC protocol parser support")
else ()
set(ZEEK_HAVE_ANALYZER_QUIC no CACHE INTERNAL "Zeek has QUIC protocol parser support")
endif ()

1
testing/btest/core/print-bpf-filters.zeek
View file

@ -1,5 +1,4 @@
# @TEST-REQUIRES: $SCRIPTS/have-spicy # @TEST-REQUIRES: $SCRIPTS/have-spicy
# @TEST-REQUIRES: $SCRIPTS/have-quic
# #
# @TEST-EXEC: zeek -r $TRACES/empty.trace >output # @TEST-EXEC: zeek -r $TRACES/empty.trace >output
# @TEST-EXEC: cat packet_filter.log >>output # @TEST-EXEC: cat packet_filter.log >>output

3
testing/btest/coverage/bare-mode-errors.test
View file

@ -4,9 +4,8 @@
# Commonly, this test may fail if one forgets to @load some base/ scripts # Commonly, this test may fail if one forgets to @load some base/ scripts
# when writing a new zeek scripts. # when writing a new zeek scripts.
# #
# Require Spicy and QUIC, otherwise their scripts cannot be loaded. # Require Spicy, otherwise its scripts cannot be loaded.
# @TEST-REQUIRES: have-spicy # @TEST-REQUIRES: have-spicy
# @TEST-REQUIRES: have-quic
# #
# @TEST-EXEC: test -d $DIST/scripts # @TEST-EXEC: test -d $DIST/scripts
# @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.zeek`; do zeek -b --parse-only $script >>errors 2>&1; done # @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.zeek`; do zeek -b --parse-only $script >>errors 2>&1; done

1
testing/btest/coverage/default-load-baseline.test
View file

@ -8,7 +8,6 @@
# below does. Don't ask. :-) # below does. Don't ask. :-)
# @TEST-REQUIRES: ${SCRIPTS}/have-spicy # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-REQUIRES: ${SCRIPTS}/have-quic
# @TEST-EXEC: zeek misc/loaded-scripts # @TEST-EXEC: zeek misc/loaded-scripts
# @TEST-EXEC: test -e loaded_scripts.log # @TEST-EXEC: test -e loaded_scripts.log
# @TEST-EXEC: cat loaded_scripts.log | grep -E -v '#' | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix # @TEST-EXEC: cat loaded_scripts.log | grep -E -v '#' | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix

3
testing/btest/coverage/init-default.test
View file

@ -7,9 +7,8 @@
# (e.g. cluster operation), and in such cases, the missing_loads baseline # (e.g. cluster operation), and in such cases, the missing_loads baseline
# can be adjusted to tolerate that. # can be adjusted to tolerate that.
# Require Spicy and QUIC, otherwise baselines change. # Require Spicy, otherwise baselines change.
# @TEST-REQUIRES: have-spicy # @TEST-REQUIRES: have-spicy
# @TEST-REQUIRES: have-quic
#@TEST-EXEC: test -d $DIST/scripts/base #@TEST-EXEC: test -d $DIST/scripts/base
#@TEST-EXEC: test -e $DIST/scripts/base/init-default.zeek #@TEST-EXEC: test -e $DIST/scripts/base/init-default.zeek

1
testing/btest/coverage/record-fields.zeek
View file

@ -1,7 +1,6 @@
# @TEST-DOC: Output interesting record types in bare and default mode recursively. Currently just the connection record type. # @TEST-DOC: Output interesting record types in bare and default mode recursively. Currently just the connection record type.
# #
# @TEST-REQUIRES: ${SCRIPTS}/have-spicy # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-REQUIRES: ${SCRIPTS}/have-quic
# @TEST-EXEC: zeek -b %INPUT >out.bare # @TEST-EXEC: zeek -b %INPUT >out.bare
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out.bare # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out.bare
# @TEST-EXEC: zeek %INPUT >out.default # @TEST-EXEC: zeek %INPUT >out.default

2
testing/btest/scripts/base/protocols/quic/chromium.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that runs the pcap # @TEST-DOC: Test that runs the pcap
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-api-cirrus-com.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-api-cirrus-com.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/curl-http3.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that runs the pcap # @TEST-DOC: Test that runs the pcap
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/curl-8.1.2-dev-http3-www-google-de.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/curl-8.1.2-dev-http3-www-google-de.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/events.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Supported events so far. # @TEST-DOC: Supported events so far.
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic %INPUT >out # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic %INPUT >out
# @TEST-EXEC: echo "zerortt.pcap" >>out # @TEST-EXEC: echo "zerortt.pcap" >>out
# @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic %INPUT >>out # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic %INPUT >>out

2
testing/btest/scripts/base/protocols/quic/firefox.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that runs the pcap # @TEST-DOC: Test that runs the pcap
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/firefox-102.13.0esr-blog-cloudflare-com.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/firefox-102.13.0esr-blog-cloudflare-com.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Pcap with fragmented and unordered CRYPTO frames. # @TEST-DOC: Pcap with fragmented and unordered CRYPTO frames.
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test interop pcap containing RETRY packet from server side. # @TEST-DOC: Test interop pcap containing RETRY packet from server side.
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/handshake.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/handshake.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test interop pcap containing RETRY packet from server side. # @TEST-DOC: Test interop pcap containing RETRY packet from server side.
# #
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that client initiating connection using 0RTT packet doesn't cause analyzer errors trying to decrypt server side. # @TEST-DOC: Test that client initiating connection using 0RTT packet doesn't cause analyzer errors trying to decrypt server side.
# #
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/quic-log.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Smoke test the quic.log production # @TEST-DOC: Smoke test the quic.log production
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic
# @TEST-EXEC: btest-diff quic.log # @TEST-EXEC: btest-diff quic.log
# @TEST-EXEC: btest-diff .stderr # @TEST-EXEC: btest-diff .stderr

2
testing/btest/scripts/base/protocols/quic/quicdoq.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Pcap with dns-over-quic lookup using https://github.com/private-octopus/quicdoq # @TEST-DOC: Pcap with dns-over-quic lookup using https://github.com/private-octopus/quicdoq
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/quicdoq.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/quicdoq.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/run-pcap.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that runs the pcap # @TEST-DOC: Test that runs the pcap
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/quic_win11_firefox_google.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/quic_win11_firefox_google.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: btest-diff conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut

2
testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek
View file

@ -1,6 +1,6 @@
# @TEST-DOC: Test that runs the pcap # @TEST-DOC: Test that runs the pcap
# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-REQUIRES: ${SCRIPTS}/have-spicy
# @TEST-EXEC: zeek -Cr $TRACES/quic/vector-max-size-crash.pcap base/protocols/quic # @TEST-EXEC: zeek -Cr $TRACES/quic/vector-max-size-crash.pcap base/protocols/quic
# @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut
# @TEST-EXEC: zeek-cut -m ts uid cause analyzer_kind analyzer_name failure_reason < analyzer.log > analyzer.log.cut # @TEST-EXEC: zeek-cut -m ts uid cause analyzer_kind analyzer_name failure_reason < analyzer.log > analyzer.log.cut

7
testing/scripts/have-quic
View file

@ -1,7 +0,0 @@
#!/bin/sh
if grep -q "ZEEK_HAVE_ANALYZER_QUIC:INTERNAL=yes" "${BUILD}"/CMakeCache.txt; then
exit 0
fi
exit 1