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

Simplify the logic a big by making Notice$email_dest have a default rather than be optional

Browse source
This commit is contained in:
Vlad Grigorescu 2021-06-17 10:31:04 -05:00
parent bfb26b9227
commit 9d0bd96e1f
21 changed files with 40 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/base/frameworks/notice/actions/email_admin.zeek
View file

@ -35,11 +35,6 @@ hook notice(n: Notice::Info)
}
if ( email != "" )
{
if ( ! n?$email_dest )
n$email_dest = set();
add n$email_dest[email];
}
}
}

5
scripts/base/frameworks/notice/actions/page.zeek
View file

@ -20,10 +20,5 @@ export {
hook notice(n: Notice::Info)
{
if ( ACTION_PAGE in n$actions )
{
if ( ! n?$email_dest )
n$email_dest = set();
add n$email_dest[mail_page_dest];
}
}

12
scripts/base/frameworks/notice/main.zeek
View file

@ -137,7 +137,7 @@ export {
actions: ActionSet &log &default=ActionSet();
## The email address(es) where to send this notice
email_dest: set[string] &log &optional;
email_dest: set[string] &log &default=set();
## By adding chunks of text into this element, other scripts
## can expand on notices that are being emailed. The normal
@ -516,19 +516,13 @@ hook Notice::policy(n: Notice::Info) &priority=10
hook Notice::notice(n: Notice::Info)
{
if ( ACTION_EMAIL in n$actions )
{
if ( ! n?$email_dest )
n$email_dest = set();
add n$email_dest[mail_dest];
}
}
hook Notice::notice(n: Notice::Info) &priority=-5
{
if ( n?$email_dest )
for ( dest in n$email_dest )
email_notice_to(n, dest, T);
for ( dest in n$email_dest )
email_notice_to(n, dest, T);
if ( ACTION_LOG in n$actions )
Log::write(Notice::LOG, n);