p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Add notes and comments to PBA FileUpload resource

This commit is contained in:
Mike Salvatore 2022-07-13 10:26:03 -04:00
parent 2e7bcd54df
commit 0d45c5fb3e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monkey/monkey_island/cc/resources/pba_file_upload.py
View File

@ -17,6 +17,7 @@ LINUX_PBA_TYPE = "PBAlinux"
WINDOWS_PBA_TYPE = "PBAwindows" WINDOWS_PBA_TYPE = "PBAwindows"
# NOTE: This resource will be reworked when the Custom PBA feature is rebuilt as a payload plugin.
class FileUpload(AbstractResource): class FileUpload(AbstractResource):
# API Spec: FileUpload -> PBAFileUpload. Change endpoint accordingly. # API Spec: FileUpload -> PBAFileUpload. Change endpoint accordingly.
""" """
@ -37,6 +38,9 @@ class FileUpload(AbstractResource):
self._file_storage_service = file_storage_repository self._file_storage_service = file_storage_repository
self._agent_configuration_repository = agent_configuration_repository self._agent_configuration_repository = agent_configuration_repository
# NOTE: None of these methods are thread-safe. Don't forget to fix that when this becomes a
# payload plugin.
# This endpoint is basically a duplicate of PBAFileDownload.get(). They serve slightly different # This endpoint is basically a duplicate of PBAFileDownload.get(). They serve slightly different
# purposes. This endpoint is authenticated, whereas the one in PBAFileDownload can not be (at # purposes. This endpoint is authenticated, whereas the one in PBAFileDownload can not be (at
# the present time). In the future, consider whether or not they should be merged, or if they # the present time). In the future, consider whether or not they should be merged, or if they
@ -68,6 +72,8 @@ class FileUpload(AbstractResource):
logger.error(str(err)) logger.error(str(err))
return make_response({"error": str(err)}, 404) return make_response({"error": str(err)}, 404)
# NOTE: Consider putting most of this functionality into a service when this is transformed into
# a payload plugin.
@jwt_required @jwt_required
def post(self, target_os): def post(self, target_os):
""" """
@ -85,6 +91,7 @@ class FileUpload(AbstractResource):
try: try:
self._update_config(target_os, safe_filename) self._update_config(target_os, safe_filename)
except Exception as err: except Exception as err:
# Roll back the entire transaction if part of it failed.
self._file_storage.delete_file(safe_filename) self._file_storage.delete_file(safe_filename)
raise err raise err
@ -124,6 +131,7 @@ class FileUpload(AbstractResource):
try: try:
self._file_storage_service.delete_file(filename) self._file_storage_service.delete_file(filename)
except Exception as err: except Exception as err:
# Roll back the entire transaction if part of it failed.
self._agent_configuration_repository.store_configuration(original_agent_configuration) self._agent_configuration_repository.store_configuration(original_agent_configuration)
raise err raise err