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

Return a warning and fail if creating a store at global scope

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-12-16 13:40:47 -07:00
parent 33eaa5ccda
commit 6b5d0491aa
3 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/broker/Manager.cc
View file

@ -1582,6 +1582,13 @@ void Manager::ProcessStoreResponse(detail::StoreHandleVal* s, broker::store::res
}
detail::StoreHandleVal* Manager::MakeMaster(const string& name, broker::backend type, broker::backend_options opts) {
if ( ! bstate ) {
if ( zeek::detail::current_scope() == zeek::detail::global_scope() )
reporter->Error("Broker stores cannot be created at the global scope");
return nullptr;
}
if ( bstate->endpoint.is_shutdown() )
return nullptr;

3
testing/btest/Baseline/broker.store.create-global-failure/out Normal file
View file

@ -0,0 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/create-global-failure.zeek, line 5: Broker stores cannot be created at the global scope
error in <...>/create-global-failure.zeek, line 5: Could not create Broker master store 'store'

6
testing/btest/broker/store/create-global-failure.zeek Normal file
View file

@ -0,0 +1,6 @@
# @TEST-DOC: Tests that creating a broker store at global scope returns an error
# @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
const x = Broker::create_master("store");
global t: table[string] of count &broker_store="store";