From 1837e0289a61bd87d508181b4a23c90e68503cac Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 24 Jan 2024 17:26:02 +0100 Subject: [PATCH] Bump Spicy to current `main`. This requires a few baseline updates, and a tweak to one test canonifier. --- auxil/spicy | 2 +- .../analyzer.log.cut | 2 +- testing/btest/Baseline/spicy.event-args/output | 2 +- testing/btest/Baseline/spicy.export-type-fail/output | 4 ++-- .../btest/Baseline/spicy.export-type-with-fields-fail/output | 4 ++-- testing/btest/Baseline/spicy.parse-error/dpd.log | 2 +- testing/btest/Baseline/spicy.ssh-banner/analyzer.log | 2 +- testing/btest/Baseline/spicy.ssh-banner/output | 2 +- .../scripts/base/protocols/quic/vector-max-size-crash.zeek | 2 +- testing/external/commit-hash.zeek-testing-private | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/auxil/spicy b/auxil/spicy index 8d081af33b..daa2e3ce48 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit 8d081af33ba787b610f671846476d9522d7858b3 +Subproject commit daa2e3ce48a92dcf6662df724a8bb1c8d5f8df4b diff --git a/testing/btest/Baseline/scripts.base.protocols.quic.vector-max-size-crash/analyzer.log.cut b/testing/btest/Baseline/scripts.base.protocols.quic.vector-max-size-crash/analyzer.log.cut index a8d2f384e3..ef746b4ee4 100644 --- a/testing/btest/Baseline/scripts.base.protocols.quic.vector-max-size-crash/analyzer.log.cut +++ b/testing/btest/Baseline/scripts.base.protocols.quic.vector-max-size-crash/analyzer.log.cut @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ts uid cause analyzer_kind analyzer_name failure_reason -1693925959.000001 CHhAvVGS1DHFjwGM9 violation protocol QUIC unhandled QUIC version 0x10010000 (<...>/QUIC.spicy::) +1693925959.000001 CHhAvVGS1DHFjwGM9 violation protocol QUIC unhandled QUIC version 0x10010000 (<...>/QUIC.spicy:) diff --git a/testing/btest/Baseline/spicy.event-args/output b/testing/btest/Baseline/spicy.event-args/output index 32754ee44b..a19edac324 100644 --- a/testing/btest/Baseline/spicy.event-args/output +++ b/testing/btest/Baseline/spicy.event-args/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Error message: failed to match regular expression (<...>/test.spicy:7:15) +Error message: failed to match regular expression (<...>/test.spicy:7:15-7:22) Error message: n/a diff --git a/testing/btest/Baseline/spicy.export-type-fail/output b/testing/btest/Baseline/spicy.export-type-fail/output index ed5e896990..8f28a3feaa 100644 --- a/testing/btest/Baseline/spicy.export-type-fail/output +++ b/testing/btest/Baseline/spicy.export-type-fail/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [error] unknown type 'NOT_SCOPED' exported [error] unknown type 'Test::DOES_NOT_EXIST' exported -[error] <...>/foo.spicy:1:13-5:3: cannot export Spicy type 'Test::X': type is self-recursive -[error] <...>/foo.spicy:9:3-13:3: cannot export Spicy type 'Test::Z': can only convert tuple types with all-named fields to Zeek +[error] <...>/foo.spicy:3:1-5:2: cannot export Spicy type 'Test::X': type is self-recursive +[error] <...>/foo.spicy:11:1-13:2: cannot export Spicy type 'Test::Z': can only convert tuple types with all-named fields to Zeek [error] : aborting after errors diff --git a/testing/btest/Baseline/spicy.export-type-with-fields-fail/output b/testing/btest/Baseline/spicy.export-type-with-fields-fail/output index 9ec5d35297..ba576887c5 100644 --- a/testing/btest/Baseline/spicy.export-type-with-fields-fail/output +++ b/testing/btest/Baseline/spicy.export-type-with-fields-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/foo.spicy:1:13-5:3: type 'Test::A' does not have field 'does_not_exist' -[error] <...>/foo.spicy:1:13-5:3: type 'Test::A' does not have field 'does_not_exist' +[error] <...>/foo.spicy:3:1-5:2: type 'Test::A' does not have field 'does_not_exist' +[error] <...>/foo.spicy:3:1-5:2: type 'Test::A' does not have field 'does_not_exist' [error] : aborting after errors diff --git a/testing/btest/Baseline/spicy.parse-error/dpd.log b/testing/btest/Baseline/spicy.parse-error/dpd.log index 8b8724f2b1..b7d7656f81 100644 --- a/testing/btest/Baseline/spicy.parse-error/dpd.log +++ b/testing/btest/Baseline/spicy.parse-error/dpd.log @@ -7,5 +7,5 @@ #open XXXX-XX-XX-XX-XX-XX #fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto analyzer failure_reason #types time string addr port addr port enum string string -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.150.186.169 49244 131.159.14.23 22 tcp SPICY_SSH failed to match regular expression (<...>/test.spicy:9:15) [SSH-2.0-OpenSSH_3.8.1p1\x0a] +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.150.186.169 49244 131.159.14.23 22 tcp SPICY_SSH failed to match regular expression (<...>/test.spicy:9:15-9:22) [SSH-2.0-OpenSSH_3.8.1p1\x0a] #close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/spicy.ssh-banner/analyzer.log b/testing/btest/Baseline/spicy.ssh-banner/analyzer.log index 08d61c5ea6..f34ea0483b 100644 --- a/testing/btest/Baseline/spicy.ssh-banner/analyzer.log +++ b/testing/btest/Baseline/spicy.ssh-banner/analyzer.log @@ -8,5 +8,5 @@ #fields ts cause analyzer_kind analyzer_name uid fuid id.orig_h id.orig_p id.resp_h id.resp_p failure_reason failure_data #types time string string string string string addr port addr port string string XXXXXXXXXX.XXXXXX violation protocol SPICY_SSH CHhAvVGS1DHFjwGM9 - 141.142.228.5 53595 54.243.55.129 80 kaputt - -XXXXXXXXXX.XXXXXX violation protocol SPICY_SSH CHhAvVGS1DHFjwGM9 - 141.142.228.5 53595 54.243.55.129 80 failed to match regular expression (<...>/ssh.spicy:7:15) POST /post HTTP/1.1\x0d\x0aUser-Agent: curl/7. +XXXXXXXXXX.XXXXXX violation protocol SPICY_SSH CHhAvVGS1DHFjwGM9 - 141.142.228.5 53595 54.243.55.129 80 failed to match regular expression (<...>/ssh.spicy:7:15-7:20) POST /post HTTP/1.1\x0d\x0aUser-Agent: curl/7. #close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/spicy.ssh-banner/output b/testing/btest/Baseline/spicy.ssh-banner/output index 109fca26c9..f35ecaea82 100644 --- a/testing/btest/Baseline/spicy.ssh-banner/output +++ b/testing/btest/Baseline/spicy.ssh-banner/output @@ -6,5 +6,5 @@ SSH banner, [orig_h=192.150.186.169, orig_p=49244/tcp, resp_h=131.159.14.23, res SSH banner, [orig_h=192.150.186.169, orig_p=49244/tcp, resp_h=131.159.14.23, resp_p=22/tcp], T, 2.0, OpenSSH_3.8.1p1 confirm, Analyzer::ANALYZER_SPICY_SSH === violation -violation, Analyzer::ANALYZER_SPICY_SSH, failed to match regular expression (<...>/ssh.spicy:7:15) +violation, Analyzer::ANALYZER_SPICY_SSH, failed to match regular expression (<...>/ssh.spicy:7:15-7:20) violation, Analyzer::ANALYZER_SPICY_SSH, kaputt 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 dc6b802389..6f0d1c7e2a 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 @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff quic.log -# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/\((.+)\.spicy:[0-9]+:[0-9]+\)/(\1.spicy::)/g" | $SCRIPTS/diff-remove-abspath' btest-diff analyzer.log.cut +# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -E "s/\((.+)\.spicy:[0-9]+:[0-9]+(-[0-9]+:[0-9]+)?\)/(\1.spicy:)/g" | $SCRIPTS/diff-remove-abspath' btest-diff analyzer.log.cut event QUIC::unhandled_version(c: connection, is_orig: bool, version: count, dcid: string, scid: string) { diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index 41174ec64c..0ff8296fa2 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -0fdc6e2b2f2930c0edf3c83c36f6aa789b0bff30 +7693d38d870e7157bf78e7e14f0b2c0c3e871c62