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

Avoid race conditions in broker.ssl_auth_failure btest

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-08-24 12:10:42 -07:00
parent 011cfc2aaa
commit c88a362d1b
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
testing/btest/broker/ssl_auth_failure.zeek
View file

@ -3,8 +3,10 @@
# @TEST-PORT: BROKER_PORT # @TEST-PORT: BROKER_PORT
# #
# @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out" # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
# @TEST-EXEC: btest-bg-run send-check1 "zeek -b ../send-check.zeek >send.out"
# @TEST-EXEC: $SCRIPTS/wait-for-file recv/listen-ready 20 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file recv/listen-ready 20 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: btest-bg-run send-check1 "zeek -b ../send-check.zeek >send.out"
# @TEST-EXEC: $SCRIPTS/wait-for-file recv/connected 20 || (btest-bg-wait -k 1 && false)
# #
# @TEST-EXEC: btest-bg-run send "zeek -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-run send "zeek -b ../send.zeek >send.out"
# @TEST-EXEC: $SCRIPTS/wait-for-file send/failed 20 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file send/failed 20 || (btest-bg-wait -k 1 && false)
@ -98,7 +100,7 @@ BTdqMbieumB/zL97iK5baHUFEJ4VRtLQhh/SOXgew/BF8ccpilI=
event zeek_init() event zeek_init()
{ {
Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::__peer_no_retry("127.0.0.1", to_port(getenv("BROKER_PORT")));
} }
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
@ -119,7 +121,7 @@ redef Broker::ssl_certificate = "../cert.1.pem";
event zeek_init() event zeek_init()
{ {
Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::__peer_no_retry("127.0.0.1", to_port(getenv("BROKER_PORT")));
} }
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
@ -136,7 +138,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
event Broker::error(code: Broker::ErrorCode, msg: string) event Broker::error(code: Broker::ErrorCode, msg: string)
{ {
system("touch failed"); system("touch failed");
print fmt("sender error: code=%s msg=%s", code, gsub(msg, /127.0.0.1:[0-9]+/, "<endpoint addr:port>")); print fmt("sender error: code=%s msg=%s", code, gsub(msg, /127.0.0.1:[0-9]+/, "<endpoint addr:port>"));
terminate(); terminate();
} }
@ -154,6 +156,7 @@ event Broker::error(code: Broker::ErrorCode, msg: string)
event zeek_init() event zeek_init()
{ {
Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
system("touch listen-ready");
} }
global peer_count = 0; global peer_count = 0;
@ -165,7 +168,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
++peer_count; ++peer_count;
if ( peer_count == 1 ) if ( peer_count == 1 )
system("touch listen-ready"); system("touch connected");
else if ( peer_count == 2 ) else if ( peer_count == 2 )
terminate(); terminate();
} }