GODRIVER-1879 Apply connectTimeoutMS to TLS handshake #594
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
benjirewis
reviewed
Mar 1, 2021
iwysiu
reviewed
Mar 1, 2021
iwysiu
approved these changes
Mar 2, 2021
kevinAlbs
approved these changes
Mar 7, 2021
| var dialCancel context.CancelFunc | ||
| if c.config.connectTimeout != 0 { | ||
| dialCtx, dialCancel = context.WithTimeout(handshakeCtx, c.config.connectTimeout) | ||
| defer dialCancel() |
There was a problem hiding this comment.
No need to change. But IIUC, since this derived from handshakeCtx, it is not strictly necessary to cancel the dialCtx. Cancelling handshakeCtx would cancel any derived contexts. Is that right?
There was a problem hiding this comment.
I have the same understanding. However, AFAIK it's good practice to defer all context.CancelFunc variables and this is happening once per connection handshake, so I don't think it's going to be prohibitive to do that here.
divjotarora
pushed a commit
that referenced
this pull request
Mar 8, 2021
divjotarora
pushed a commit
that referenced
this pull request
Mar 8, 2021
This was referenced Mar 10, 2021
Closed
Closed
Closed
This was referenced Mar 15, 2021
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Merged
Closed
Merged
Closed
faem
pushed a commit
to kubedb/mongo-go-driver
that referenced
this pull request
Mar 17, 2022
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.
This PR modifies the connection code to apply the
connectTimeoutMSoption to both socket establishment and the TLS handshake. Previously, it was only applied to the former. To aid in testing, I also modified the existingtlsConnectionSourceinterface to return a newtlsConninterface rather than directly returning a concretetls.Conn. This allows us to provide a custom implementation for TLS handshaking in our tests.The alternate approach considered was to use tls.Dialer or tls.DialWithDialer. These aren't flexible enough because they require us to specify a net.Dialer as the dialer for the underlying network socket, but we actually accept a custom interface to dial connections, which defaults to
net.Dialerbut can be something else (e.g. we have seen this option used to dial TLS connections via openssl rather than crytp/tls).