Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'topic/christian/management-default-listen-interfaces'

Browse source 
* topic/christian/management-default-listen-interfaces:
  Management framework: bump external cluster testsuite
  Management framework: switch default network visibilities
This commit is contained in:
Christian Kreibich 2022-06-14 12:02:03 -07:00
commit 216aaa5774
7 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
5.1.0-dev.30 | 2022-06-14 12:02:46 -0700
* Management framework: bump external cluster testsuite (Christian Kreibich, Corelight)
* Management framework: switch default network visibilities (Christian Kreibich, Corelight)
5.1.0-dev.27 | 2022-06-14 11:30:28 -0700 5.1.0-dev.27 | 2022-06-14 11:30:28 -0700
* chore: Set permissions for GitHub actions (naveen) * chore: Set permissions for GitHub actions (naveen)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.27 5.1.0-dev.30

12
scripts/policy/frameworks/management/agent/boot.zeek
View file

@ -8,12 +8,16 @@
@load ./config @load ./config
# The agent needs the supervisor to listen for node management requests. We # The agent needs the supervisor to listen for node management requests, which
# need to tell it to do so, and we need to do so here, in the agent # by default it does not. We need to tell it to do so here, in the agent
# bootstrapping code, so the redef applies prior to the fork of the agent # bootstrap code, so the redef applies prior to the fork of the agent process.
# process itself.
redef SupervisorControl::enable_listen = T; redef SupervisorControl::enable_listen = T;
# The Supervisor listens on Broker's default address: any interface. In the
# Management framework there's no need for other machines to interact with
# instance Supervisors directly, so restrict it to listening locally.
redef Broker::default_listen_address = "127.0.0.1";
event zeek_init() event zeek_init()
{ {
if ( ! Supervisor::is_supervisor() ) if ( ! Supervisor::is_supervisor() )

2
scripts/policy/frameworks/management/agent/config.zeek
View file

@ -106,7 +106,7 @@ function endpoint_info(): Broker::EndpointInfo
else if ( Management::default_address != "" ) else if ( Management::default_address != "" )
network$address = Management::default_address; network$address = Management::default_address;
else else
network$address = "127.0.0.1"; network$address = "0.0.0.0";
if ( Management::Agent::listen_port != "" ) if ( Management::Agent::listen_port != "" )
network$bound_port = to_port(Management::Agent::listen_port); network$bound_port = to_port(Management::Agent::listen_port);

5
scripts/policy/frameworks/management/config.zeek
View file

@ -19,9 +19,8 @@ export {
## The fallback listen address if more specific adddresses, such as ## The fallback listen address if more specific adddresses, such as
## the controller's :zeek:see:`Management::Controller::listen_address` ## the controller's :zeek:see:`Management::Controller::listen_address`
## remains empty. Unless redefined, this uses Broker's own default ## remains empty. Unless redefined, this listens on all interfaces.
## listen address. const default_address = "0.0.0.0" &redef;
const default_address = Broker::default_listen_address &redef;
## The retry interval for Broker connnects. Defaults to a more ## The retry interval for Broker connnects. Defaults to a more
## aggressive value compared to Broker's 30s. ## aggressive value compared to Broker's 30s.

2
scripts/policy/frameworks/management/controller/config.zeek
View file

@ -86,7 +86,7 @@ function network_info(): Broker::NetworkInfo
else if ( Management::default_address != "" ) else if ( Management::default_address != "" )
ni$address = Management::default_address; ni$address = Management::default_address;
else else
ni$address = "127.0.0.1"; ni$address = "0.0.0.0";
if ( Management::Controller::listen_port != "" ) if ( Management::Controller::listen_port != "" )
ni$bound_port = to_port(Management::Controller::listen_port); ni$bound_port = to_port(Management::Controller::listen_port);

2
testing/external/commit-hash.zeek-testing-cluster vendored
View file

@ -1 +1 @@
837a20a947645b63340a4231d5a8665126283f66 a1c8c09c8c661a1ea9299e0356f3652502b8dcd2