3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app: improve upload error handling 

Use a lock to guarantee thread safety when parsing data.  If
parsing results an error, save the error and raise it.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-10-29 20:14:03 -04:00
parent a71c5c159d
commit 4f32f477bd
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
moonraker/app.py
View File

@ -16,6 +16,7 @@ import tornado
import tornado.iostream import tornado.iostream
import tornado.httputil import tornado.httputil
import tornado.web import tornado.web
from asyncio import Lock
from inspect import isclass from inspect import isclass
from tornado.escape import url_unescape, url_escape from tornado.escape import url_unescape, url_escape
from tornado.routing import Rule, PathMatches, AnyMatches from tornado.routing import Rule, PathMatches, AnyMatches
@ -29,7 +30,7 @@ from .websockets import (
WebSocket, WebSocket,
BridgeSocket BridgeSocket
) )
from streaming_form_data import StreamingFormDataParser from streaming_form_data import StreamingFormDataParser, ParseFailedException
from streaming_form_data.targets import FileTarget, ValueTarget, SHA256Target from streaming_form_data.targets import FileTarget, ValueTarget, SHA256Target
# Annotation imports # Annotation imports
@ -924,6 +925,8 @@ class FileUploadHandler(AuthorizedRequestHandler):
self.file_manager: FileManager = self.server.lookup_component( self.file_manager: FileManager = self.server.lookup_component(
'file_manager') 'file_manager')
self.max_upload_size = max_upload_size self.max_upload_size = max_upload_size
self.parse_lock = Lock()
self.parse_error: Optional[ParseFailedException] = None
def prepare(self) -> None: def prepare(self) -> None:
super(FileUploadHandler, self).prepare() super(FileUploadHandler, self).prepare()
@ -949,11 +952,24 @@ class FileUploadHandler(AuthorizedRequestHandler):
self._parser.register(name, target) self._parser.register(name, target)
async def data_received(self, chunk: bytes) -> None: async def data_received(self, chunk: bytes) -> None:
if self.request.method == "POST": if self.request.method == "POST" and self.parse_error is None:
evt_loop = self.server.get_event_loop() async with self.parse_lock:
await evt_loop.run_in_thread(self._parser.data_received, chunk) evt_loop = self.server.get_event_loop()
try:
await evt_loop.run_in_thread(self._parser.data_received, chunk)
except ParseFailedException as err:
self.parse_error = err
async def post(self) -> None: async def post(self) -> None:
if self.parse_error is not None:
self._file.on_finish()
try:
os.remove(self._file.filename)
except Exception:
pass
raise self.server.error(
"File Upload Parsing Failed", 500
) from self.parse_error
form_args = {} form_args = {}
chk_target = self._targets.pop('checksum') chk_target = self._targets.pop('checksum')
calc_chksum = self._sha256_target.value.lower() calc_chksum = self._sha256_target.value.lower()