Fix #2570: close only when TLS buffers drained #2587
Merged
Conversation
This file contains 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
scaprile
reviewed
Jan 23, 2024
Comment on lines
+288
to
293
| } else { | ||
| if (n > 0) c->rtls.len += (size_t) n; | ||
| if (c->is_tls_hs) mg_tls_handshake(c); | ||
| if (c->is_tls_hs) return; | ||
| n = mg_tls_recv(c, buf, len); | ||
| } else if (n == MG_IO_WAIT) { | ||
| n = mg_tls_recv(c, buf, len); | ||
| } |
There was a problem hiding this comment.
mg_tls_handshake() used to execute on n > 0, now that path is taken as long as there is no IO_ERR; even on IO_WAIT, overriding the call to mg_tls_recv().
Looks cleaner, as long as that is what's intended.
Closed
scaprile
approved these changes
Jan 23, 2024
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.
Mongoose reads raw encrypted data into the c->rtls buffer. Then, it feeds that data to the TLS library.
Currently, if server finished sending the data, it closes the connection. Mongoose reads data into c->rtls, so c->rtls has some data to be decrypted, then Mongoose reads 0 from the socket, indicating that server has closed the connection.
And Mongoose closed the connection too, despite it has some data in c->rtls yet to be decrypted!
This PR fixes that issue and decrypts everything before closing the connection.