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

Change report service to use report model. 

Because report saving/fetching happens through model, model can encrypt/decrypt sensitive data
This commit is contained in:
VakarisZ 2021-09-21 10:45:39 +03:00
parent ea7a75df26
commit 5077d84269
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
monkey/monkey_island/cc/services/reporting/report.py
View File

@ -16,7 +16,7 @@ from common.config_value_paths import (
from common.network.network_range import NetworkRange from common.network.network_range import NetworkRange
from common.network.segmentation_utils import get_ip_in_src_and_not_in_dst from common.network.segmentation_utils import get_ip_in_src_and_not_in_dst
from monkey_island.cc.database import mongo from monkey_island.cc.database import mongo
from monkey_island.cc.models import Monkey from monkey_island.cc.models import Monkey, Report
from monkey_island.cc.services.config import ConfigService from monkey_island.cc.services.config import ConfigService
from monkey_island.cc.services.configuration.utils import ( from monkey_island.cc.services.configuration.utils import (
get_config_network_segments_as_subnet_groups, get_config_network_segments_as_subnet_groups,
@ -633,12 +633,11 @@ class ReportService:
"strong_users": PTHReportService.get_strong_users_on_crit_details(), "strong_users": PTHReportService.get_strong_users_on_crit_details(),
}, },
"recommendations": {"issues": issues, "domain_issues": domain_issues}, "recommendations": {"issues": issues, "domain_issues": domain_issues},
"meta": {"latest_monkey_modifytime": monkey_latest_modify_time}, "meta_info": {"latest_monkey_modifytime": monkey_latest_modify_time},
} }
ReportExporterManager().export(report) ReportExporterManager().export(report)
mongo.db.report.drop() report = ReportService.encode_dot_char_before_mongo_insert(report)
mongo.db.report.insert_one(ReportService.encode_dot_char_before_mongo_insert(report)) Report.save_report(report)
return report return report
@staticmethod @staticmethod
@ -685,10 +684,10 @@ class ReportService:
:return: True if report is the latest one, False if there isn't a report or its not the :return: True if report is the latest one, False if there isn't a report or its not the
latest. latest.
""" """
latest_report_doc = mongo.db.report.find_one({}, {"meta.latest_monkey_modifytime": 1}) latest_report_doc = mongo.db.report.find_one({}, {"meta_info.latest_monkey_modifytime": 1})
if latest_report_doc: if latest_report_doc:
report_latest_modifytime = latest_report_doc["meta"]["latest_monkey_modifytime"] report_latest_modifytime = latest_report_doc["meta_info"]["latest_monkey_modifytime"]
latest_monkey_modifytime = Monkey.get_latest_modifytime() latest_monkey_modifytime = Monkey.get_latest_modifytime()
return report_latest_modifytime == latest_monkey_modifytime return report_latest_modifytime == latest_monkey_modifytime
@ -717,6 +716,7 @@ class ReportService:
@staticmethod @staticmethod
def get_report(): def get_report():
if ReportService.is_latest_report_exists(): if not ReportService.is_latest_report_exists():
return ReportService.decode_dot_char_before_mongo_insert(mongo.db.report.find_one()) return safe_generate_regular_report()
return safe_generate_regular_report()
return ReportService.decode_dot_char_before_mongo_insert(Report.get_report())