Add tests for e-mail actions, and cleanup the new logic a bit.

testing/btest/scripts/base/frameworks/notice/action-email-admin.zeek

@@ -0,0 +1,24 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+@load base/frameworks/notice
+@load base/utils/site
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef Site::local_admins += { [1.0.0.0/8] = set("cloudflare@example.net", "postmaster@the.cloud") };
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static", $src=1.1.1.1, $dst=[::1]]);
+	}
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_EMAIL_ADMIN];
+	}

testing/btest/scripts/base/frameworks/notice/action-email-custom-address.zeek

@@ -0,0 +1,29 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+# Tests overriding the e-mail destination for a specific notice
+
+
+@load base/frameworks/notice
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_EMAIL];
+	}
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]);
+	}
+
+hook Notice::policy(n: Notice::Info)
+	{
+	n$email_dest = set("admin@example.net");
+	}

testing/btest/scripts/base/frameworks/notice/action-email-multiple.zeek

@@ -0,0 +1,25 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+# Test what happens with PAGE and EMAIL
+
+@load base/frameworks/notice
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::mail_page_dest = "page@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]);
+	}
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_PAGE];
+	add n$actions[Notice::ACTION_EMAIL];
+	}

testing/btest/scripts/base/frameworks/notice/action-email.zeek

@@ -0,0 +1,21 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+@load base/frameworks/notice
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]);
+	}
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_EMAIL];
+	}

testing/btest/scripts/base/frameworks/notice/action-page-with-hostnames.zeek

@@ -0,0 +1,23 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+@load base/frameworks/notice
+@load frameworks/notice/extend-email/hostnames
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::mail_page_dest = "page@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static", $src=1.1.1.1, $dst=[::1]]);
+	}
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_PAGE];
+	}

testing/btest/scripts/base/frameworks/notice/action-page.zeek

@@ -0,0 +1,22 @@
+# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: btest-diff sendmail.out
+
+@load base/frameworks/notice
+
+redef Notice::mail_dest = "user@example.net";
+redef Notice::mail_page_dest = "page@example.net";
+redef Notice::sendmail = "fake-sendmail";
+
+redef enum Notice::Type += {
+	Test_Notice,
+};
+
+event zeek_init()
+	{
+	NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]);
+	}
+
+hook Notice::policy(n: Notice::Info) &priority=1
+	{
+	add n$actions[Notice::ACTION_PAGE];
+	}