p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved JSON parsing to state.py

This commit is contained in:
Shay Nehmad 2019-09-02 12:32:00 +03:00
parent a330dc1bb7
commit 5487395797
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/services/telemetry/processing/state.py
View File

@ -1,3 +1,4 @@
from monkey_island.cc.models import Monkey
from monkey_island.cc.services.node import NodeService from monkey_island.cc.services.node import NodeService
from monkey_island.cc.services.telemetry.zero_trust_tests.segmentation import \ from monkey_island.cc.services.telemetry.zero_trust_tests.segmentation import \
test_passed_findings_for_unreached_segments test_passed_findings_for_unreached_segments
@ -12,4 +13,5 @@ def process_state_telemetry(telemetry_json):
NodeService.set_monkey_dead(monkey, False) NodeService.set_monkey_dead(monkey, False)
if telemetry_json['data']['done']: if telemetry_json['data']['done']:
test_passed_findings_for_unreached_segments(telemetry_json) current_monkey = Monkey.get_single_monkey_by_guid(telemetry_json['monkey_guid'])
test_passed_findings_for_unreached_segments(current_monkey)

4
monkey/monkey_island/cc/services/telemetry/zero_trust_tests/segmentation.py
View File

@ -41,7 +41,6 @@ def is_segmentation_violation(current_monkey, target_ip, source_subnet, target_s
def test_segmentation_violation(current_monkey, target_ip): def test_segmentation_violation(current_monkey, target_ip):
# TODO - lower code duplication between this and report.py. # TODO - lower code duplication between this and report.py.
# TODO - single machine
subnet_groups = get_config_network_segments_as_subnet_groups() subnet_groups = get_config_network_segments_as_subnet_groups()
for subnet_group in subnet_groups: for subnet_group in subnet_groups:
subnet_pairs = itertools.product(subnet_group, subnet_group) subnet_pairs = itertools.product(subnet_group, subnet_group)
@ -71,9 +70,8 @@ def get_segmentation_violation_event(current_monkey, source_subnet, target_ip, t
) )
def test_passed_findings_for_unreached_segments(state_telemetry_json): def test_passed_findings_for_unreached_segments(current_monkey):
flat_all_subnets = [item for sublist in get_config_network_segments_as_subnet_groups() for item in sublist] flat_all_subnets = [item for sublist in get_config_network_segments_as_subnet_groups() for item in sublist]
current_monkey = Monkey.get_single_monkey_by_guid(state_telemetry_json['monkey_guid'])
create_or_add_findings_for_all_pairs(flat_all_subnets, current_monkey) create_or_add_findings_for_all_pairs(flat_all_subnets, current_monkey)