Merge branch 'topic/bbannier/fixes'

zeek · Sep 4, 2023 · eb8d3a0 · eb8d3a0
2 parents 0489767 + 67543ff
commit eb8d3a0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -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

diff --git a/testing/Baseline/tests.rrq/conn.log b/testing/Baseline/tests.rrq/conn.log
@@ -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
diff --git a/testing/Baseline/tests.wrq/conn.log b/testing/Baseline/tests.wrq/conn.log
@@ -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
diff --git a/testing/tests/rrq.zeek b/testing/tests/rrq.zeek
@@ -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
 #

diff --git a/testing/tests/wrq.zeek b/testing/tests/wrq.zeek
@@ -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
 #