Fix leaked TLS handshake promise #180
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
PopFlamingo
commented
Mar 12, 2020
| @@ -383,32 +383,33 @@ final class ConnectionPool { | |||
| } | |||
|
|
|||
| return channel.flatMap { channel -> EventLoopFuture<ConnectionPool.Connection> in | |||
| channel.pipeline.addSSLHandlerIfNeeded(for: self.key, tlsConfiguration: self.configuration.tlsConfiguration, handshakePromise: handshakePromise).flatMap { | |||
| channel.pipeline.addSSLHandlerIfNeeded(for: self.key, tlsConfiguration: self.configuration.tlsConfiguration, handshakePromise: handshakePromise) | |||
There was a problem hiding this comment.
The promise and returned future were redundant IMO so this only makes use of handshakePromise now
weissi
requested changes
Mar 12, 2020
| defer { | ||
| XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true)) | ||
| } | ||
| XCTAssertThrowsError(try httpClient.get(url: "http://localhost/").wait()) { error in |
There was a problem hiding this comment.
this test isn't great. It relies on nothing being bound to port 80 on localhost. Can I suggest a slightly different strategy: Let's bind a random port with a server socket, then immediately close it and then connect that port instead and we have pretty high confidence that this port won't be bound by something else
There was a problem hiding this comment.
Oops actually I don't think it does, I must still close it because the connection is still accepted it seems
There was a problem hiding this comment.
@weissi Latest push should be ok 🙂
motivation: TLS handshake promise was leaked in some cases of failure (see #179) changes: - Avoid leaking promise - Clearer completion flow for related futures - Add testAvoidLeakingTLSHandshakeCompletionPromise test
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.
motivation:
TLS handshake promise was leaked in some cases of failure (fixes #179)
changes: