Tidy ConscryptEngineSocket state machine.#1120
Merged
Merged
Conversation
Previously the socket would never actually reach STATE_READY but it didn't matter. This tidy-up makes the states and transitions more explicit and moves TLS metric logging to the correct place to prevent duplicate logging if waitForHandshake is called multiple times. Also moves calling of the SSLSocket handshake listeners outside of the SSLEngine handshake callback, this means they can operate on the socket without causing re-entrant calls to wrap() etc. This behaviour isn't defined to be allowed anywhere and it doesn't work with the FD socket. Finally tidied a bunch of IDEA warnings from SSLSocketTest and used assertThrows where possible.
sbgoog
approved these changes
Mar 29, 2023
prbprbprb
pushed a commit
to prbprbprb/conscrypt
that referenced
this pull request
Apr 2, 2023
This is analogous to google#1120 and removes double-counting by only counting metrics during explicit state changes. There is a lot more tidying up that could be done here, but as this class is long deprecated, this change is kept to the minimum required to ensure consistent counting between the EngineSocket and FdSocket. Also incorporates the "failed" values from google#1123 to make analysis clearer. TODO(prb): Tested manually: We have no real tests to ensure consistent stats counting.
prbprbprb
added a commit
that referenced
this pull request
Apr 3, 2023
This is analogous to #1120 and removes double-counting by only counting metrics during explicit state changes. There is a lot more tidying up that could be done here, but as this class is long deprecated, this change is kept to the minimum required to ensure consistent counting between the EngineSocket and FdSocket. Also incorporates the "failed" values from #1123 to make analysis clearer. TODO(prb): Tested manually: We have no real tests to ensure consistent stats counting.
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
2 participants
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.
Previously the socket would never actually reach STATE_READY but it didn't matter.
This tidy-up makes the states and transitions more explicit and moves TLS metric logging to the correct place to prevent duplicate logging if waitForHandshake is called multiple times.
Also moves calling of the SSLSocket handshake listeners outside of the SSLEngine handshake callback, this means they can operate on the socket without causing re-entrant calls to wrap() etc. This behaviour isn't defined to be allowed anywhere and it doesn't work with the FD socket.
Finally tidied a bunch of IDEA warnings from SSLSocketTest and used assertThrows where possible.