diff --git a/monkey/infection_monkey/transport/attack_telems/victim_host_telem.py b/monkey/infection_monkey/transport/attack_telems/victim_host_telem.py index c549bde1e..e70c03c2c 100644 --- a/monkey/infection_monkey/transport/attack_telems/victim_host_telem.py +++ b/monkey/infection_monkey/transport/attack_telems/victim_host_telem.py @@ -7,7 +7,7 @@ class VictimHostTelem(AttackTelem): def __init__(self, technique, status, machine, data=None): """ - ATT&CK telemetry that parses and sends VictimHost's (remote machine's) data + ATT&CK telemetry that parses and sends VictimHost telemetry :param technique: Technique ID. E.g. T111 :param status: int from ScanStatus Enum :param machine: VictimHost obj from model/host.py diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index e8238185e..88d7c9f5d 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -30,7 +30,7 @@ from cc.resources.telemetry_feed import TelemetryFeed from cc.resources.pba_file_download import PBAFileDownload from cc.services.config import ConfigService from cc.resources.pba_file_upload import FileUpload -from cc.resources.attack_telem import AttackTelem +from cc.resources.attack import Attack __author__ = 'Barak' @@ -124,6 +124,6 @@ def init_app(mongo_url): '/api/fileUpload/?load=', '/api/fileUpload/?restore=') api.add_resource(RemoteRun, '/api/remote-monkey', '/api/remote-monkey/') - api.add_resource(AttackTelem, '/api/attack/') + api.add_resource(Attack, '/api/attack/') return app diff --git a/monkey/monkey_island/cc/resources/attack_telem.py b/monkey/monkey_island/cc/resources/attack.py similarity index 82% rename from monkey/monkey_island/cc/resources/attack_telem.py rename to monkey/monkey_island/cc/resources/attack.py index a206d21d0..681c54274 100644 --- a/monkey/monkey_island/cc/resources/attack_telem.py +++ b/monkey/monkey_island/cc/resources/attack.py @@ -1,7 +1,7 @@ import flask_restful from flask import request import json -from cc.services.attack.attack_results import set_results +from cc.services.attck.attack_results import set_results import logging __author__ = 'VakarisZ' @@ -9,7 +9,7 @@ __author__ = 'VakarisZ' LOG = logging.getLogger(__name__) -class AttackTelem(flask_restful.Resource): +class Attack(flask_restful.Resource): """ ATT&CK endpoint used to retrieve matrix related info from monkey """ diff --git a/monkey/monkey_island/cc/services/attack/__init__.py b/monkey/monkey_island/cc/services/attck/__init__.py similarity index 100% rename from monkey/monkey_island/cc/services/attack/__init__.py rename to monkey/monkey_island/cc/services/attck/__init__.py diff --git a/monkey/monkey_island/cc/services/attack/attack_results.py b/monkey/monkey_island/cc/services/attck/attack_results.py similarity index 100% rename from monkey/monkey_island/cc/services/attack/attack_results.py rename to monkey/monkey_island/cc/services/attck/attack_results.py