arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

Fix header FSM in webserver, fix Windows uploads (#7805)

Browse Source 
When a file upload ends in \r\n (i.e. a Windows formatted text file) the
sequence of bytes on the wire is `\r\n\r\n----...boundary-marker...`.

When the FSM in Webserver was evaluating the stream, that 2nd `\r` would
be written as valid data and the FSM parser would be reset and see `\n`
as the 1st character, which wouldn't match.  This would a) add an extra
`\r` to uploaded files, and b) cause uploads to hang.

Fix by checking on a header FSM mismatch if the next character input
could possibly match our marker, and if so handle it properly.

Fixes #7803
This commit is contained in:
Earle F. Philhower, III 2021-01-01 13:07:59 -08:00 committed by GitHub
parent 5b42e73baa
commit da138456a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/ESP8266WebServer/src/Parsing-impl.h
View File

@ -467,10 +467,16 @@ bool ESP8266WebServerTemplate<ServerType>::_parseForm(ClientType& client, const
for (int i = 0; i < boundaryPtr; i++) { for (int i = 0; i < boundaryPtr; i++) {
_uploadWriteByte( fastBoundary[ i ] ); _uploadWriteByte( fastBoundary[ i ] );
} }
if (in == fastBoundary[ 0 ]) {
// This could be the start of the real end, mark it so and don't emit/skip it
boundaryPtr = 1;
} else {
// Not the 1st char of our pattern, so emit and ignore
_uploadWriteByte( in ); _uploadWriteByte( in );
boundaryPtr = 0; boundaryPtr = 0;
} }
} }
}
// Found the boundary string, finish processing this file upload // Found the boundary string, finish processing this file upload
if (_currentHandler && _currentHandler->canUpload(_currentUri)) if (_currentHandler && _currentHandler->canUpload(_currentUri))
_currentHandler->upload(*this, _currentUri, *_currentUpload); _currentHandler->upload(*this, _currentUri, *_currentUpload);