Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix testing against zeek-6.0 #10

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Fix testing against zeek-6.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f638cf1
Add explicit testing agains zeek-6.0
bbannier Sep 4, 2023
67543ff
Strip down test `conn.log`
bbannier Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ jobs:
strategy:
matrix:
version:
- zeek:6.0
- zeek-dev:latest

fail-fast: false

runs-on: ubuntu-latest
container: zeekurity/${{ matrix.version }}
container: zeek/${{ matrix.version }}

steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 2 additions & 11 deletions testing/Baseline/tests.rrq/conn.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
#separator \x09
#set_separator ,
#empty_field (empty)
#unset_field -
#path conn
#open XXXX-XX-XX-XX-XX-XX
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig local_resp missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents
#types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string]
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.0.253 50618 192.168.0.10 69 udp spicy_tftp - - - S0 - - 0 D 1 48 0 0 -
XXXXXXXXXX.XXXXXX ClEkJM2Vm5giqnMf4h 192.168.0.10 3445 192.168.0.253 50618 udp spicy_tftp_data 0.181558 24795 196 SF - - 0 Dd 49 26167 49 1568 -
#close XXXX-XX-XX-XX-XX-XX
CHhAvVGS1DHFjwGM9 spicy_tftp
ClEkJM2Vm5giqnMf4h spicy_tftp_data
13 changes: 2 additions & 11 deletions testing/Baseline/tests.wrq/conn.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
#separator \x09
#set_separator ,
#empty_field (empty)
#unset_field -
#path conn
#open XXXX-XX-XX-XX-XX-XX
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig local_resp missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents
#types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string]
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.0.1 57509 192.168.0.13 69 udp spicy_tftp - - - S0 - - 0 D 1 48 0 0 -
XXXXXXXXXX.XXXXXX ClEkJM2Vm5giqnMf4h 192.168.0.13 2087 192.168.0.1 57509 udp spicy_tftp_data 0.246451 200 24795 SF - - 0 Dd 50 1600 49 26167 -
#close XXXX-XX-XX-XX-XX-XX
CHhAvVGS1DHFjwGM9 spicy_tftp
ClEkJM2Vm5giqnMf4h spicy_tftp_data
1 change: 1 addition & 0 deletions testing/tests/rrq.zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# @TEST-EXEC: env >env
# @TEST-EXEC: zeek -r ${TRACES}/tftp_rrq.pcap ${PACKAGE} %INPUT
# @TEST-EXEC: cat conn.log | zeek-cut uid service > conn.log.tmp && mv conn.log.tmp conn.log
# @TEST-EXEC: btest-diff conn.log
# @TEST-EXEC: btest-diff tftp.log
#
Expand Down
1 change: 1 addition & 0 deletions testing/tests/wrq.zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.

# @TEST-EXEC: zeek -r ${TRACES}/tftp_wrq.pcap ${PACKAGE} %INPUT
# @TEST-EXEC: cat conn.log | zeek-cut uid service > conn.log.tmp && mv conn.log.tmp conn.log
# @TEST-EXEC: btest-diff conn.log
# @TEST-EXEC: btest-diff tftp.log
#
Expand Down
Loading