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

Fix some formatting issues

This commit is contained in:
Shay Nehmad 2019-11-08 17:42:42 +02:00
parent ad1e85f867
commit 3607547aea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/monkey_island/cc/environment/testing.py
View File

@ -4,8 +4,9 @@ from monkey_island.cc.environment import Environment
class TestingEnvironment(Environment): class TestingEnvironment(Environment):
""" """
Use this environment for running Unit Tests. Use this environment for running Unit Tests.
This will cause all mongo connections to happen via `mongomock` instead of using an actual mongodb instance. This will cause all mongo connections to happen via `mongomock` instead of using an actual mongodb instance.
""" """
def __init__(self): def __init__(self):
super(TestingEnvironment, self).__init__() super(TestingEnvironment, self).__init__()
self.testing = True self.testing = True

6
monkey/monkey_island/cc/services/reporting/zero_trust_service.py
View File

@ -68,7 +68,8 @@ class ZeroTrustService(object):
all_statuses |= set(Finding.objects(test=test).distinct("status")) all_statuses |= set(Finding.objects(test=test).distinct("status"))
for status in all_statuses: for status in all_statuses:
if zero_trust_consts.ORDERED_TEST_STATUSES.index(status) < zero_trust_consts.ORDERED_TEST_STATUSES.index(worst_status): if zero_trust_consts.ORDERED_TEST_STATUSES.index(status) \
< zero_trust_consts.ORDERED_TEST_STATUSES.index(worst_status):
worst_status = status worst_status = status
return worst_status return worst_status
@ -95,7 +96,8 @@ class ZeroTrustService(object):
""" """
current_worst_status = zero_trust_consts.STATUS_UNEXECUTED current_worst_status = zero_trust_consts.STATUS_UNEXECUTED
for finding in all_findings_for_test: for finding in all_findings_for_test:
if zero_trust_consts.ORDERED_TEST_STATUSES.index(finding.status) < zero_trust_consts.ORDERED_TEST_STATUSES.index(current_worst_status): if zero_trust_consts.ORDERED_TEST_STATUSES.index(finding.status) \
< zero_trust_consts.ORDERED_TEST_STATUSES.index(current_worst_status):
current_worst_status = finding.status current_worst_status = finding.status
return current_worst_status return current_worst_status