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

Island: fix rebase issues created when rebasing ransomware table generation feature

This commit is contained in:
VakarisZ 2021-07-13 09:32:50 +03:00
parent f8cbd4cb33
commit a0e0e0a9be
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/services/ransomware/ransomware_report.py
View File

@ -1,7 +1,6 @@
from monkey_island.cc.database import mongo
from monkey_island.cc.services.reporting.report import ReportService
from typing import Dict, List from typing import Dict, List
from monkey_island.cc.database import mongo
from monkey_island.cc.services.reporting.report import ReportService from monkey_island.cc.services.reporting.report import ReportService
@ -80,6 +79,7 @@ def _get_monkey_origin_exploits(monkey_hostname, exploited_nodes):
else: else:
return ["Manual execution"] return ["Manual execution"]
def get_propagation_stats() -> Dict: def get_propagation_stats() -> Dict:
scanned = ReportService.get_scanned() scanned = ReportService.get_scanned()
exploited = ReportService.get_exploited() exploited = ReportService.get_exploited()

7
monkey/tests/unit_tests/monkey_island/cc/services/ransomware/test_ransomware_report.py
View File

@ -1,7 +1,5 @@
import mongomock import mongomock
import pytest import pytest
from mongoengine import get_connection
import mongomock
from tests.data_for_tests.mongo_documents.edges import EDGE_EXPLOITED, EDGE_SCANNED from tests.data_for_tests.mongo_documents.edges import EDGE_EXPLOITED, EDGE_SCANNED
from tests.data_for_tests.mongo_documents.monkeys import MONKEY_AT_ISLAND, MONKEY_AT_VICTIM from tests.data_for_tests.mongo_documents.monkeys import MONKEY_AT_ISLAND, MONKEY_AT_VICTIM
from tests.data_for_tests.mongo_documents.telemetries.file_encryption import ( from tests.data_for_tests.mongo_documents.telemetries.file_encryption import (
@ -10,11 +8,8 @@ from tests.data_for_tests.mongo_documents.telemetries.file_encryption import (
ENCRYPTION_ERROR, ENCRYPTION_ERROR,
ENCRYPTION_ONE_FILE, ENCRYPTION_ONE_FILE,
) )
import pytest
from monkey_island.cc.services.ransomware import ransomware_report from monkey_island.cc.services.ransomware import ransomware_report
from monkey_island.cc.services.reporting.report import ReportService
from monkey_island.cc.services.ransomware.ransomware_report import get_encrypted_files_table from monkey_island.cc.services.ransomware.ransomware_report import get_encrypted_files_table
from monkey_island.cc.services.reporting.report import ReportService from monkey_island.cc.services.reporting.report import ReportService
@ -87,7 +82,6 @@ def test_get_encrypted_files_table__only_errors(fake_mongo, monkeypatch):
] ]
@pytest.mark.skip(reason="Can't find a way to use the same mock database client in Monkey model")
@pytest.mark.usefixtures("uses_database") @pytest.mark.usefixtures("uses_database")
def test_get_encrypted_files_table__no_telemetries(fake_mongo, monkeypatch): def test_get_encrypted_files_table__no_telemetries(fake_mongo, monkeypatch):
fake_mongo.db.monkey.insert(MONKEY_AT_ISLAND) fake_mongo.db.monkey.insert(MONKEY_AT_ISLAND)
@ -105,6 +99,7 @@ def test_get_encrypted_files_table__no_telemetries(fake_mongo, monkeypatch):
assert results == [] assert results == []
@pytest.fixture @pytest.fixture
def patch_report_service_for_stats(monkeypatch): def patch_report_service_for_stats(monkeypatch):
TEST_SCANNED_RESULTS = [{}, {}, {}, {}] TEST_SCANNED_RESULTS = [{}, {}, {}, {}]