Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Community-id: load main script in notice script, fix notice script

Browse source 
This change makes the community-id script that adds the community id to
notice.log automatically load the main script if this was not already
loaded.

In the past, the script just did not perform any action if the main
script was not loaded.

This change also makes the notice script respect the seed/base64
settings that were set in the main script.

Fixes GH-3242
This commit is contained in:
Johanna Amann 2023-08-22 14:51:14 +01:00
parent e8292be0ce
commit 4156c4764a
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/policy/frameworks/notice/community-id.zeek
View file

@ -1,11 +1,9 @@
# Source this script in addition to protocols/conn/community-id # Source this script to add Community ID to notices.
# to add Community ID to notices. # This script will automatically load the main community-id script.
# Only support loading this if the main script is also loaded.
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/notice @load base/frameworks/notice
@load policy/protocols/conn/community-id-logging
@ifdef ( CommunityID::seed )
module CommunityID::Notice; module CommunityID::Notice;
@ -23,6 +21,5 @@ export {
hook Notice::notice(n: Notice::Info) hook Notice::notice(n: Notice::Info)
{ {
if ( CommunityID::Notice::enabled && n?$conn ) if ( CommunityID::Notice::enabled && n?$conn )
n$community_id = community_id_v1(n$conn$id); n$community_id = community_id_v1(n$conn$id, CommunityID::seed, CommunityID::do_base64);
} }
@endif

2
testing/external/commit-hash.zeek-testing vendored
View file

@ -1 +1 @@
d59caff708b41db11fa0cbfe0b1f95b46c3e700e be1821ecf246b70ea22f975228c2c3db61b908bb

2
testing/external/commit-hash.zeek-testing-private vendored
View file

@ -1 +1 @@
7162c907aa25e155ea841710ef30b65afb578c3f 2f22a30cd5f9328e4ce583261d4f22303d89e1e3