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

Island: Decouple FileUpload service from FilePond

This commit is contained in:
Mike Salvatore 2022-04-27 12:59:08 -04:00
parent 1476efa383
commit 3a5d28cc59
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,7 @@ from http import HTTPStatus
import flask_restful import flask_restful
from flask import Response, make_response, request, send_file from flask import Response, make_response, request, send_file
from werkzeug.datastructures import FileStorage from werkzeug.utils import secure_filename as sanitize_filename
from werkzeug.utils import secure_filename
from common.config_value_paths import PBA_LINUX_FILENAME_PATH, PBA_WINDOWS_FILENAME_PATH from common.config_value_paths import PBA_LINUX_FILENAME_PATH, PBA_WINDOWS_FILENAME_PATH
from monkey_island.cc.resources.auth.auth import jwt_required from monkey_island.cc.resources.auth.auth import jwt_required
@ -21,19 +20,18 @@ WINDOWS_PBA_TYPE = "PBAwindows"
class FileUpload(flask_restful.Resource): class FileUpload(flask_restful.Resource):
""" """
File upload endpoint used to exchange files with filepond component on the front-end File upload endpoint used to send/receive Custom PBA files
""" """
def __init__(self, file_storage_service: IFileStorageService): def __init__(self, file_storage_service: IFileStorageService):
self._file_storage_service = file_storage_service self._file_storage_service = file_storage_service
# TODO: Fix references/coupling to filepond
# TODO: Add comment explaining why this is basically a duplicate of the endpoint in the # TODO: Add comment explaining why this is basically a duplicate of the endpoint in the
# PBAFileDownload resource. # PBAFileDownload resource.
@jwt_required @jwt_required
def get(self, target_os): def get(self, target_os):
""" """
Sends file to filepond Sends file to the requester
:param target_os: Indicates which file to send, linux or windows :param target_os: Indicates which file to send, linux or windows
:return: Returns file contents :return: Returns file contents
""" """
@ -59,38 +57,24 @@ class FileUpload(flask_restful.Resource):
@jwt_required @jwt_required
def post(self, target_os): def post(self, target_os):
""" """
Receives user's uploaded file from filepond Receives user's uploaded file
:param target_os: Type indicates which file was received, linux or windows :param target_os: Type indicates which file was received, linux or windows
:return: Returns flask response object with uploaded file's filename :return: Returns flask response object with uploaded file's filename
""" """
if self._is_target_os_supported(target_os): if self._is_target_os_supported(target_os):
return Response(status=HTTPStatus.UNPROCESSABLE_ENTITY, mimetype="text/plain") return Response(status=HTTPStatus.UNPROCESSABLE_ENTITY, mimetype="text/plain")
filename = self._upload_pba_file( file_storage = next(request.files.values()) # For now, assume there's only one file
# TODO: This "filepond" string can be changed to be more generic in the `react-filepond` safe_filename = sanitize_filename(file_storage.filename)
# component.
request.files["filepond"],
(target_os == LINUX_PBA_TYPE),
)
response = Response(response=filename, status=200, mimetype="text/plain")
return response
def _upload_pba_file(self, file_storage: FileStorage, is_linux=True):
"""
Uploads PBA file to island's file system
:param request_: Request object containing PBA file
:param is_linux: Boolean indicating if this file is for windows or for linux
:return: filename string
"""
filename = secure_filename(file_storage.filename)
self._file_storage_service.save_file(filename, file_storage.stream)
self._file_storage_service.save_file(safe_filename, file_storage.stream)
ConfigService.set_config_value( ConfigService.set_config_value(
(PBA_LINUX_FILENAME_PATH if is_linux else PBA_WINDOWS_FILENAME_PATH), filename (PBA_LINUX_FILENAME_PATH if target_os == LINUX_PBA_TYPE else PBA_WINDOWS_FILENAME_PATH),
safe_filename,
) )
return filename response = Response(response=safe_filename, status=200, mimetype="text/plain")
return response
@jwt_required @jwt_required
def delete(self, target_os): def delete(self, target_os):