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

Expand scripts.base.frameworks.intel.cluster-transparency test

Browse source 
This simply expands this test to match the behavior of
cluster-transparency-with-proxy, since the two are so similar. This test does
not seem to need disabling the worker's initial send of the data store.
This commit is contained in:
Christian Kreibich 2022-06-01 22:26:25 -07:00
parent ed5d60f758
commit 984d6c0136
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1.intel.log
View file

@ -1,4 +1,5 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
### NOTE: This file has been sorted with diff-sort.
#separator \x09 #separator \x09
#set_separator , #set_separator ,
#empty_field (empty) #empty_field (empty)
@ -7,5 +8,6 @@
#open XXXX-XX-XX-XX-XX-XX #open XXXX-XX-XX-XX-XX-XX
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p seen.indicator seen.indicator_type seen.where seen.node matched sources fuid file_mime_type file_desc #fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p seen.indicator seen.indicator_type seen.where seen.node matched sources fuid file_mime_type file_desc
#types time string addr port addr port string enum enum string set[enum] set[string] string string string #types time string addr port addr port string enum enum string set[enum] set[string] string string string
XXXXXXXXXX.XXXXXX - - - - - 123.123.123.123 Intel::ADDR Intel::IN_ANYWHERE worker-2 Intel::ADDR worker-1 - - -
#close XXXX-XX-XX-XX-XX-XX #close XXXX-XX-XX-XX-XX-XX
XXXXXXXXXX.XXXXXX - - - - - 123.123.123.123 Intel::ADDR Intel::IN_ANYWHERE worker-2 Intel::ADDR worker-1 - - -
XXXXXXXXXX.XXXXXX - - - - - 4.3.2.1 Intel::ADDR Intel::IN_ANYWHERE worker-1 Intel::ADDR worker-2 - - -

1
testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/worker-1..stdout
View file

@ -4,3 +4,4 @@ new_indicator: 1.2.3.4 inserted by manager
new_indicator: 123.123.123.123 inserted by worker-1 new_indicator: 123.123.123.123 inserted by worker-1
new_indicator: 4.3.2.1 inserted by worker-2 new_indicator: 4.3.2.1 inserted by worker-2
new_item triggered for 123.123.123.123 by worker-1 on worker-1 new_item triggered for 123.123.123.123 by worker-1 on worker-1
seeing 4.3.2.1

2
testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/worker-2..stdout
View file

@ -1,7 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
### NOTE: This file has been sorted with diff-sort. ### NOTE: This file has been sorted with diff-sort.
Doing a lookup
new_indicator: 1.2.3.4 inserted by manager new_indicator: 1.2.3.4 inserted by manager
new_indicator: 123.123.123.123 inserted by worker-1 new_indicator: 123.123.123.123 inserted by worker-1
new_indicator: 4.3.2.1 inserted by worker-2 new_indicator: 4.3.2.1 inserted by worker-2
new_item triggered for 4.3.2.1 by worker-2 on worker-2 new_item triggered for 4.3.2.1 by worker-2 on worker-2
seeing 123.123.123.123

33
testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
View file

@ -1,3 +1,6 @@
# This test verifies intel data propagation via a cluster. The manager and both
# workers insert intel items, and both workers do lookups that we expect to hit.
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_PORT1
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_PORT2
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_PORT3
@ -9,7 +12,7 @@
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout
# @TEST-EXEC: btest-diff manager-1/intel.log # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log
@TEST-START-FILE cluster-layout.zeek @TEST-START-FILE cluster-layout.zeek
redef Cluster::nodes = { redef Cluster::nodes = {
@ -35,8 +38,10 @@ event Cluster::node_up(name: string, id: string)
} }
} }
global worker2_data = 0; global log_writes = 0;
global worker_data = 0;
global sent_data = F; global sent_data = F;
# Watch for new indicators send to workers. # Watch for new indicators send to workers.
event Intel::insert_indicator(item: Intel::Item) event Intel::insert_indicator(item: Intel::Item)
{ {
@ -53,16 +58,23 @@ event Intel::insert_indicator(item: Intel::Item)
Intel::insert([$indicator="4.3.2.1", $indicator_type=Intel::ADDR, $meta=[$source="worker-2"]]); Intel::insert([$indicator="4.3.2.1", $indicator_type=Intel::ADDR, $meta=[$source="worker-2"]]);
} }
# We're forcing worker-2 to do a lookup when it has three intelligence items # Each worker does a lookup when it has 3 intel items which were
# which were distributed over the cluster (data inserted locally is resent). # distributed over the cluster (data inserted locally is resent).
# Worker 1 observes the host inserted by worker 2, and vice versa.
if ( Cluster::node == "worker-1" )
{
if ( ++worker_data == 3 )
{
print "seeing 4.3.2.1";
Intel::seen([$host=4.3.2.1, $where=Intel::IN_ANYWHERE]);
}
}
if ( Cluster::node == "worker-2" ) if ( Cluster::node == "worker-2" )
{ {
++worker2_data; if ( ++worker_data == 3 )
if ( worker2_data == 3 )
{ {
# Now that everything is inserted, see if we can match on the data inserted print "seeing 123.123.123.123";
# by worker-1.
print "Doing a lookup";
Intel::seen([$host=123.123.123.123, $where=Intel::IN_ANYWHERE]); Intel::seen([$host=123.123.123.123, $where=Intel::IN_ANYWHERE]);
} }
} }
@ -83,7 +95,8 @@ event Intel::new_item(item: Intel::Item)
event Intel::log_intel(rec: Intel::Info) event Intel::log_intel(rec: Intel::Info)
{ {
terminate(); if ( ++log_writes == 2 )
terminate();
} }
event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string)