Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2679: connect/config: only access task.Result if we know it completed #2680

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix #2679: connect/config: only access task.Result if we know it completed #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e23802
connect/config: only access task.Result if we know it completed
mgravell Mar 19, 2024
ffab4e1
cite PR
mgravell Mar 19, 2024
dd72842
typo
mgravell Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ Current package versions:

## Unreleased
- TLS certificate/`TrustIssuer`: Check EKU in X509 chain checks when validating cerificates ([#2670 by NickCraver](https://github.com/StackExchange/StackExchange.Redis/pull/2670))
- Fix [#2679](https://github.com/StackExchange/StackExchange.Redis/issues/2679) - blocking call in long-running connects ([#2680 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2680))

## 2.7.33

- **Potentiallty Breaking**: Fix `CheckTrustedIssuer` certificate validation for broken chain scenarios ([#2665 by NickCraver](https://github.com/StackExchange/StackExchange.Redis/pull/2665))
- **Potentially Breaking**: Fix `CheckTrustedIssuer` certificate validation for broken chain scenarios ([#2665 by NickCraver](https://github.com/StackExchange/StackExchange.Redis/pull/2665))
- Users inadvertently trusting a remote cert with a broken chain could not be failing custom validation before this change. This is only in play if you are using `ConfigurationOptions.TrustIssuer` at all.
- Add new `LoggingTunnel` API; see https://stackexchange.github.io/StackExchange.Redis/Logging ([#2660 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2660))
- Fix [#2664](https://github.com/StackExchange/StackExchange.Redis/issues/2664): Move ProcessBacklog to fully sync to prevent thread pool hopping and blocking on awaits ([#2667 by NickCraver](https://github.com/StackExchange/StackExchange.Redis/pull/2667))
Expand Down
12 changes: 10 additions & 2 deletions src/StackExchange.Redis/ConnectionMultiplexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,17 @@ private static ConnectionMultiplexer ConnectImpl(ConfigurationOptions configurat
// note that task has timeouts internally, so it might take *just over* the regular timeout
var task = muxer.ReconfigureAsync(first: true, reconfigureAll: false, log, null, "connect");

if (!task.Wait(muxer.SyncConnectTimeout(true)))
if (task.Wait(muxer.SyncConnectTimeout(true)))
{
// completed promptly - we can check the outcome; hard failures
// (such as password problems) should be reported promptly - it
// won't magically start working
if (!task.Result) throw ExceptionFactory.UnableToConnect(muxer, muxer.failureMessage);
}
else
{
// incomplete - most likely slow initial connection; optionally
// allow a soft failure mode
task.ObserveErrors();
if (muxer.RawConfig.AbortOnConnectFail)
{
Expand All @@ -720,7 +729,6 @@ private static ConnectionMultiplexer ConnectImpl(ConfigurationOptions configurat
}
}

if (!task.Result) throw ExceptionFactory.UnableToConnect(muxer, muxer.failureMessage);
killMe = null;
Interlocked.Increment(ref muxer._connectCompletedCount);

Expand Down