This repository was archived by the owner on Dec 15, 2022. It is now read-only.
- Notifications
You must be signed in to change notification settings - Fork141
Fix a race condition in SslStreamBase::AsyncHandshakeCallback#41
Open
paulvirag wants to merge1 commit intoopenssl-net:masterChoose a base branch frompaulvirag:master
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
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
flaub commentedNov 15, 2016
LGTM |
GreyAutomaton commentedNov 15, 2016
This fix worked for the same kind of hanging condition with a server I was working with. I haven't encountered any side effects. |
I suspect this is what bikashjoshi was seeing with#2 as well. His workaround was to place Thread.Sleep(100) at the start of AsyncHandshakeCallback, which I assume was giving the network a tiny bit of extra time to catch up and reassemble handshake messages that were split into multiple writes by the server's TCP stack. |
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
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.
Uh oh!
There was an error while loading.Please reload this page.
AsyncHandshakeCallback currently assumes that an SSL_ERROR_WANT_READ result from ProcessHandshake means it's our turn to write data from the write_bio. This isn't always the case - sometimes there's more data for us to read from the network, and if we blindly try to do a write operation we can end up entering InternalBeginWrite with write_bio.BytesPending == 0 (which will cause the original AuthenticateAsClient caller thread to hang inside of EndAuthenticateAsClient/EndRead indefinitely).
Instead this callback should check write_bio.BytesPending > 0 and initiate either a read or a write depending on which makes sense. I've attached a test that will verify this by presenting a server certificate which is larger than 16384 bytes (the size of the network buffer). This will force the server to split the handshake message into multiple writes, and if the client isn't prepared to perform multiple network reads in sequence then it will deadlock.
The following sample code will also provide a quick proof of concept, since slashdot's certificate is enormous (tried on a couple machines, YMMV 😄)
without patch: will hang inside AuthenticateAsClient
with patch: will complete as expected