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

Merge remote-tracking branch 'origin/topic/johanna/fix-failed-service-logging'

Browse source 
* origin/topic/johanna/fix-failed-service-logging:
  Fix policy/protocols/conn/failed-service-logging.zeek

(cherry picked from commit 6f8924596f)
This commit is contained in:
Tim Wojtulewicz 2025-05-07 10:29:37 -07:00
parent e326e31d7e
commit 0d70dde10b
5 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,3 +1,17 @@
7.2.0-rc1.13 | 2025-05-07 10:32:36 -0700
* Fix policy/protocols/conn/failed-service-logging.zeek (Johanna Amann, Corelight)
In GH-4422 it was pointed out that the protocols/conn/failed-service-logging.zeek
policy script only works when
`DPD::track_removed_services_in_connection=T` is set.
This was caused by a logic error in the script. This commit fixes this
logic error and introduces an additional test that checks that
failed-service-logging works even when the option is not set to true.
(cherry picked from commit 6f8924596fb86ee0c25fe26c810f3a8e3f9068a9)
7.2.0-rc1.12 | 2025-05-07 17:25:07 +0200
* btest/cluster/generic/publish-any: Apply Christian's fix from broker/publish-any (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-rc1.12
7.2.0-rc1.13

2
scripts/policy/protocols/conn/failed-service-logging.zeek
View file

@ -21,7 +21,7 @@ hook Analyzer::disabling_analyzer(c: connection, atype: AllAnalyzers::Tag, aid:
return;
# Only add if previously confirmed
if ( Analyzer::name(atype) !in c$service || Analyzer::name(atype) !in c$service_violation )
if ( Analyzer::name(atype) !in c$service && Analyzer::name(atype) !in c$service_violation )
return;
# Only log if dpd.zeek will disable

11
testing/btest/Baseline/scripts.base.frameworks.analyzer.dpd-logging-configuration-2/conn.log Normal file
View file

@ -0,0 +1,11 @@
### 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 ip_proto failed_service
#types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string] count set[string]
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 127.0.0.1 51354 127.0.0.1 21 tcp - 9.891089 34 71 SF T T 0 ShAdDaFf 13 718 10 599 - 6 ftp
#close XXXX-XX-XX-XX-XX-XX

4
testing/btest/scripts/base/frameworks/analyzer/dpd-logging-configuration.zeek
View file

@ -5,3 +5,7 @@
@load policy/protocols/conn/failed-service-logging
redef DPD::track_removed_services_in_connection = T;
# @TEST-START-NEXT
@load policy/protocols/conn/failed-service-logging