From 1774a25f0079076851232a81247a320ddc31b705 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 11 Oct 2023 17:15:31 +0200 Subject: [PATCH] ci/btest: Remove spicy-quic helper, disable Spicy on CentOS 7 The have-quic pattern wasn't great and it wouldn't scale. --- .cirrus.yml | 2 ++ src/analyzer/protocol/quic/CMakeLists.txt | 7 ------- testing/btest/core/print-bpf-filters.zeek | 1 - testing/btest/coverage/bare-mode-errors.test | 3 +-- testing/btest/coverage/default-load-baseline.test | 1 - testing/btest/coverage/init-default.test | 3 +-- testing/btest/coverage/record-fields.zeek | 1 - testing/btest/scripts/base/protocols/quic/chromium.zeek | 2 +- testing/btest/scripts/base/protocols/quic/curl-http3.zeek | 2 +- testing/btest/scripts/base/protocols/quic/events.zeek | 2 +- testing/btest/scripts/base/protocols/quic/firefox.zeek | 2 +- .../scripts/base/protocols/quic/fragmented-crypto.zeek | 2 +- .../protocols/quic/interop/quic-go_quic-go/handshake.zeek | 2 +- .../base/protocols/quic/interop/quic-go_quic-go/retry.zeek | 2 +- .../protocols/quic/interop/quic-go_quic-go/zerortt.zeek | 2 +- testing/btest/scripts/base/protocols/quic/quic-log.zeek | 2 +- testing/btest/scripts/base/protocols/quic/quicdoq.zeek | 2 +- testing/btest/scripts/base/protocols/quic/run-pcap.zeek | 2 +- .../scripts/base/protocols/quic/vector-max-size-crash.zeek | 2 +- testing/scripts/have-quic | 7 ------- 20 files changed, 16 insertions(+), 33 deletions(-) delete mode 100755 testing/scripts/have-quic diff --git a/.cirrus.yml b/.cirrus.yml index 572d5182e9..5eddbeff6a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -204,6 +204,8 @@ centos7_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR + env: + ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG debian12_task: container: diff --git a/src/analyzer/protocol/quic/CMakeLists.txt b/src/analyzer/protocol/quic/CMakeLists.txt index f5131a97b4..30940524d0 100644 --- a/src/analyzer/protocol/quic/CMakeLists.txt +++ b/src/analyzer/protocol/quic/CMakeLists.txt @@ -13,10 +13,3 @@ else () "Warning: QUIC analyzer unavailable - requires OpenSSL 1.1 or later (found ${OPENSSL_VERSION})" ) 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 () diff --git a/testing/btest/core/print-bpf-filters.zeek b/testing/btest/core/print-bpf-filters.zeek index 9428af07d7..3d961b5792 100644 --- a/testing/btest/core/print-bpf-filters.zeek +++ b/testing/btest/core/print-bpf-filters.zeek @@ -1,5 +1,4 @@ # @TEST-REQUIRES: $SCRIPTS/have-spicy -# @TEST-REQUIRES: $SCRIPTS/have-quic # # @TEST-EXEC: zeek -r $TRACES/empty.trace >output # @TEST-EXEC: cat packet_filter.log >>output diff --git a/testing/btest/coverage/bare-mode-errors.test b/testing/btest/coverage/bare-mode-errors.test index 28c0b640ed..be4beaa541 100644 --- a/testing/btest/coverage/bare-mode-errors.test +++ b/testing/btest/coverage/bare-mode-errors.test @@ -4,9 +4,8 @@ # Commonly, this test may fail if one forgets to @load some base/ 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-quic # # @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 diff --git a/testing/btest/coverage/default-load-baseline.test b/testing/btest/coverage/default-load-baseline.test index 47424f5113..9b9fc1f1f0 100644 --- a/testing/btest/coverage/default-load-baseline.test +++ b/testing/btest/coverage/default-load-baseline.test @@ -8,7 +8,6 @@ # below does. Don't ask. :-) # @TEST-REQUIRES: ${SCRIPTS}/have-spicy -# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek misc/loaded-scripts # @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 diff --git a/testing/btest/coverage/init-default.test b/testing/btest/coverage/init-default.test index dbfd553691..9dd4b1d1c7 100644 --- a/testing/btest/coverage/init-default.test +++ b/testing/btest/coverage/init-default.test @@ -7,9 +7,8 @@ # (e.g. cluster operation), and in such cases, the missing_loads baseline # 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-quic #@TEST-EXEC: test -d $DIST/scripts/base #@TEST-EXEC: test -e $DIST/scripts/base/init-default.zeek diff --git a/testing/btest/coverage/record-fields.zeek b/testing/btest/coverage/record-fields.zeek index 45fe3634f9..3d1275e474 100644 --- a/testing/btest/coverage/record-fields.zeek +++ b/testing/btest/coverage/record-fields.zeek @@ -1,7 +1,6 @@ # @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-quic # @TEST-EXEC: zeek -b %INPUT >out.bare # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out.bare # @TEST-EXEC: zeek %INPUT >out.default diff --git a/testing/btest/scripts/base/protocols/quic/chromium.zeek b/testing/btest/scripts/base/protocols/quic/chromium.zeek index bf3a35aa62..b53055f53f 100644 --- a/testing/btest/scripts/base/protocols/quic/chromium.zeek +++ b/testing/btest/scripts/base/protocols/quic/chromium.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/curl-http3.zeek b/testing/btest/scripts/base/protocols/quic/curl-http3.zeek index 0c756fd14b..78bc14aa97 100644 --- a/testing/btest/scripts/base/protocols/quic/curl-http3.zeek +++ b/testing/btest/scripts/base/protocols/quic/curl-http3.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/events.zeek b/testing/btest/scripts/base/protocols/quic/events.zeek index 5810ce5127..b95c735840 100644 --- a/testing/btest/scripts/base/protocols/quic/events.zeek +++ b/testing/btest/scripts/base/protocols/quic/events.zeek @@ -1,6 +1,6 @@ # @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: echo "zerortt.pcap" >>out # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic %INPUT >>out diff --git a/testing/btest/scripts/base/protocols/quic/firefox.zeek b/testing/btest/scripts/base/protocols/quic/firefox.zeek index 04c5231aef..31d2358743 100644 --- a/testing/btest/scripts/base/protocols/quic/firefox.zeek +++ b/testing/btest/scripts/base/protocols/quic/firefox.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek b/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek index fdde1bb40d..b64210fd1b 100644 --- a/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek +++ b/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek index 6ab93bd949..0def3cf306 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek index cda59adf6e..2fa6e34017 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek index 05e282ae63..e1d5c698a2 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek @@ -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-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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/quic-log.zeek b/testing/btest/scripts/base/protocols/quic/quic-log.zeek index f44b64ee86..7bce29a66f 100644 --- a/testing/btest/scripts/base/protocols/quic/quic-log.zeek +++ b/testing/btest/scripts/base/protocols/quic/quic-log.zeek @@ -1,6 +1,6 @@ # @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: btest-diff quic.log # @TEST-EXEC: btest-diff .stderr diff --git a/testing/btest/scripts/base/protocols/quic/quicdoq.zeek b/testing/btest/scripts/base/protocols/quic/quicdoq.zeek index 6b59766b31..a9bc28dd39 100644 --- a/testing/btest/scripts/base/protocols/quic/quicdoq.zeek +++ b/testing/btest/scripts/base/protocols/quic/quicdoq.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/run-pcap.zeek b/testing/btest/scripts/base/protocols/quic/run-pcap.zeek index 1e65d099d5..d280dd6043 100644 --- a/testing/btest/scripts/base/protocols/quic/run-pcap.zeek +++ b/testing/btest/scripts/base/protocols/quic/run-pcap.zeek @@ -1,6 +1,6 @@ # @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-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek b/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek index 1cbc2a0590..78e9adeb9b 100644 --- a/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek +++ b/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek @@ -1,6 +1,6 @@ # @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-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 diff --git a/testing/scripts/have-quic b/testing/scripts/have-quic deleted file mode 100755 index 2969280170..0000000000 --- a/testing/scripts/have-quic +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if grep -q "ZEEK_HAVE_ANALYZER_QUIC:INTERNAL=yes" "${BUILD}"/CMakeCache.txt; then - exit 0 -fi - -exit 1