WIP: Prevent crash on WebSocket request to non-WebSocket node.#106
Draft
MauAbata wants to merge 1 commit intofhessel:masterfrom
Draft
WIP: Prevent crash on WebSocket request to non-WebSocket node.#106MauAbata wants to merge 1 commit intofhessel:masterfrom
MauAbata wants to merge 1 commit intofhessel:masterfrom
Conversation
gb-123-git
added a commit
to gb-123-git/esp32_https_server
that referenced
this pull request
Jan 23, 2022
Prevent crash on WebSocket request to non-WebSocket node. fhessel#106
gb-123-git
added a commit
to gb-123-git/esp32_https_server
that referenced
this pull request
Jan 23, 2022
WIP: Prevent crash on WebSocket request to non-WebSocket node. fhessel#106
khoih-prog
added a commit
to khoih-prog/ESP32_HTTPS_Server
that referenced
this pull request
Sep 27, 2022
Merge some upstream PRs - Handling of errors - like unstable network - coming via SSL fhessel#89 - WIP: Prevent crash on WebSocket request to non-WebSocket node. fhessel#106 - Fix infinite loop when the buffer ends with \r fhessel#123 - Fixed memory leak in the Websocket example fhessel#157
This was referenced Sep 27, 2022
Closed
khoih-prog
added a commit
to khoih-prog/ESP32_HTTPS_Server
that referenced
this pull request
Sep 27, 2022
1. Merge some upstream PRs - Handling of errors - like unstable network - coming via SSL fhessel#89 - WIP: Prevent crash on WebSocket request to non-WebSocket node. fhessel#106 - Fix infinite loop when the buffer ends with \r fhessel#123 - Fixed memory leak in the Websocket example fhessel#157 2. Update examples and `README.md`
khoih-prog
added a commit
to khoih-prog/ESP32_HTTPS_Server
that referenced
this pull request
Sep 27, 2022
1. Merge some upstream PRs - Handling of errors - like unstable network - coming via SSL fhessel#89 - WIP: Prevent crash on WebSocket request to non-WebSocket node. fhessel#106 - Fix infinite loop when the buffer ends with \r fhessel#123 - Fixed memory leak in the Websocket example fhessel#157 2. Update examples and `README.md`
khoih-prog
added a commit
to khoih-prog/ESP32_HTTPS_Server
that referenced
this pull request
Sep 27, 2022
1. Merge some upstream PRs - Handling of errors - like unstable network - coming via SSL fhessel#89 - WIP: Prevent crash on WebSocket request to non-WebSocket node. fhessel#106 - Fix infinite loop when the buffer ends with \r fhessel#123 - Fixed memory leak in the Websocket example fhessel#157 2. Update examples and `README.md`
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
1 participant
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.
This provides a partial fix for #51 to prevent the Guru from having to meditate. It's been tested on ESP32.
This now checks the HTTPNode type if a WebSocket was requested and only proceeds if the node is in fact a WebSocket, thus preventing the
newHandler()call from failing on normal HTTP nodes.TODO
Right now I'm calling
raiseError(404...because that was the first copypaste I can find. I'm not actually sure the best way to reject the websocket connection as I'm not familiar with this library (just picked it up yesterday). This code is sufficient to move the crash over to the client side, which reports a bad frame header now.A proper rejection should be sent, however that is accomplished in WebSocket land.
Testing
Clone and run the WebSocket chat server example from the master branch, and use https://www.websocket.org/echo.html to connect to the root URL on the device. This should panic and reset your ESP32. Connecting to
/chatshould work as expected.Check out this PR and do the same. The ESP32 should no longer panic, and report the rejection of non-WebSocket request.