CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename functions to avoid naming conflict with setup vars

Browse Source
This commit is contained in:
Jason Ertel
2021-01-15 08:55:30 -05:00
parent 0f6805823e
commit 07b5f1d23e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/common/tools/sbin/so-common
View File

@@ -157,7 +157,7 @@ set_version() {
} }
require_manager() { require_manager() {
if is_manager; then if is_manager_node; then
echo "This is a manager, We can proceed." echo "This is a manager, We can proceed."
else else
echo "Please run this command on the manager; the manager controls the grid." echo "Please run this command on the manager; the manager controls the grid."
@@ -165,7 +165,7 @@ require_manager() {
fi fi
} }
is_manager() { is_manager_node() {
# Check to see if this is a manager node # Check to see if this is a manager node
role=$(lookup_role) role=$(lookup_role)
is_single_node_grid && return 0 is_single_node_grid && return 0
@@ -175,7 +175,7 @@ is_manager() {
return 1 return 1
} }
is_sensor() { is_sensor_node() {
# Check to see if this is a sensor (forward) node # Check to see if this is a sensor (forward) node
role=$(lookup_role) role=$(lookup_role)
is_single_node_grid && return 0 is_single_node_grid && return 0

10
salt/common/tools/sbin/so-tcpreplay
View File

@@ -47,25 +47,25 @@ if ! docker ps | grep -q so-tcpreplay; then
echo "Replay functionality not enabled; attempting to enable now (may require Internet access)..." echo "Replay functionality not enabled; attempting to enable now (may require Internet access)..."
echo echo
if is_manager; then if is_manager_node; then
TRUSTED_CONTAINERS=("so-tcpreplay") TRUSTED_CONTAINERS=("so-tcpreplay")
mkdir -p /opt/so/log/tcpreplay mkdir -p /opt/so/log/tcpreplay
update_docker_containers "tcpreplay" "" "" "/opt/so/log/tcpreplay/init.log" update_docker_containers "tcpreplay" "" "" "/opt/so/log/tcpreplay/init.log"
fi fi
if is_sensor; then if is_sensor_node; then
if ! is_manager; then if ! is_manager_node; then
echo "Attempting to start replay container. If this fails then you may need to run this command on the manager first." echo "Attempting to start replay container. If this fails then you may need to run this command on the manager first."
fi fi
so-tcpreplay-start || fail "Unable to initialize tcpreplay" so-tcpreplay-start || fail "Unable to initialize tcpreplay"
fi fi
fi fi
if is_sensor; then if is_sensor_node; then
echo "Replaying PCAP(s) at ${REPLAYSPEED} Mbps on interface ${REPLAYIFACE}..." echo "Replaying PCAP(s) at ${REPLAYSPEED} Mbps on interface ${REPLAYIFACE}..."
docker exec so-tcpreplay /usr/bin/bash -c "/usr/local/bin/tcpreplay -i ${REPLAYIFACE} -M${REPLAYSPEED} $@" docker exec so-tcpreplay /usr/bin/bash -c "/usr/local/bin/tcpreplay -i ${REPLAYIFACE} -M${REPLAYSPEED} $@"
echo "Replay completed. Warnings shown above are typically expected." echo "Replay completed. Warnings shown above are typically expected."
elif is_manager; then elif is_manager_node; then
echo "The sensor nodes in this grid can now replay traffic." echo "The sensor nodes in this grid can now replay traffic."
else else
echo "Unable to replay traffic since this node is not a sensor node." echo "Unable to replay traffic since this node is not a sensor node."