Repository navigation
fix(upload): send the 406 response for a rejected upload - #3306
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When an upload is rejected with 406 (an invalid MD5 file, an unsupported file type),
UploadFileService::handleError()callsrequest->send()and then closes the connection straight away so the client fails fast. ESPAsyncWebServer'ssend()only stores the response. It is written once the whole request body has been parsed, so the close always wins and the client gets no response at all.curlreports "Empty reply from server" (exit 52) instead of the 406.Fix
Don't send or close in
handleError()for 406.uploadComplete()already sends the stored error code once the body has arrived, as it does for every other code. The later chunks are already ignored once an error is recorded.The cost is that a rejected large file is uploaded in full before the 406 arrives, the same as a firmware for the wrong chip (503) already behaves. The WebUI only offers
.json,.binand.md5, and shows the same message for any failed upload.Testing
BBQKees Gateway E32 V2 (
s_16M_P, with #3305 applied so the rejected uploads don't crash),curlto/rest/uploadFile:EMS-ESP.md5EMS-ESP.md5containinghellonotes.txtbig.zip.md5then.bins_16M_P, clang-format clean.The Recovery firmware's
uploadFail()(recovery/main.cpp) closes the connection the same way after a 406. Not changed here.Checklist
devbranch.clang-formatCHANGELOG_LATEST.mdupdated