Skip to content

Fix HttpConnectionPool timers race on disposal #72615

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

Merged
CarnaViire merged 4 commits into from
Jul 22, 2022
Merged

Fix HttpConnectionPool timers race on disposal #72615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
403dcb8
Access _authorityExpireTimer and _altSvcBlocklistTimerCancellation un…
CarnaViire Jul 21, 2022
a5fed6b
Early return
CarnaViire Jul 21, 2022
98add00
Fix timeout test assert
CarnaViire Jul 21, 2022
61f5ac2
Fix lock-if inversion
CarnaViire Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 36 additions & 11 deletions src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,10 +1136,13 @@ internal void HandleAltSvc(IEnumerable<string> altSvcHeaderValues, TimeSpan? res
// 'clear' should be the only value present.
if (value == AltSvcHeaderValue.Clear)
{
ExpireAltSvcAuthority();
Debug.Assert(_authorityExpireTimer != null);
_authorityExpireTimer.Change(Timeout.Infinite, Timeout.Infinite);
break;
lock (SyncObj)
{
ExpireAltSvcAuthority();
Debug.Assert(_authorityExpireTimer != null || _disposed);
_authorityExpireTimer?.Change(Timeout.Infinite, Timeout.Infinite);
break;
}
}

if (nextAuthority == null && value != null && value.AlpnProtocolName == "h3")
Expand Down Expand Up @@ -1181,6 +1184,12 @@ internal void HandleAltSvc(IEnumerable<string> altSvcHeaderValues, TimeSpan? res

lock (SyncObj)
{
if (_disposed)
{
// avoid creating or touching _authorityExpireTimer after disposal
return;
}

if (_authorityExpireTimer == null)
{
var thisRef = new WeakReference<HttpConnectionPool>(this);
Expand Down Expand Up @@ -1274,6 +1283,12 @@ internal void BlocklistAuthority(HttpAuthority badAuthority)
{
lock (SyncObj)
{
if (_disposed)
{
// avoid creating _altSvcBlocklistTimerCancellation after disposal
return;
}

altSvcBlocklist = _altSvcBlocklist;
if (altSvcBlocklist == null)
{
Expand All @@ -1297,36 +1312,46 @@ internal void BlocklistAuthority(HttpAuthority badAuthority)
}
}

CancellationToken altSvcBlocklistTimerCt;

lock (SyncObj)
{
if (_disposed)
{
// avoid touching _authorityExpireTimer and _altSvcBlocklistTimerCancellation after disposal
return;
}

if (_http3Authority == badAuthority)
{
ExpireAltSvcAuthority();
Debug.Assert(_authorityExpireTimer != null);
_authorityExpireTimer.Change(Timeout.Infinite, Timeout.Infinite);
}

Debug.Assert(_altSvcBlocklistTimerCancellation != null);
altSvcBlocklistTimerCt = _altSvcBlocklistTimerCancellation.Token;
}

Debug.Assert(_altSvcBlocklistTimerCancellation != null);
if (added)
{
_ = Task.Delay(AltSvcBlocklistTimeoutInMilliseconds)
_ = Task.Delay(AltSvcBlocklistTimeoutInMilliseconds, altSvcBlocklistTimerCt)
.ContinueWith(t =>
{
lock (altSvcBlocklist)
{
altSvcBlocklist.Remove(badAuthority);
}
}, _altSvcBlocklistTimerCancellation.Token, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}, altSvcBlocklistTimerCt, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}

if (disabled)
{
_ = Task.Delay(AltSvcBlocklistTimeoutInMilliseconds)
_ = Task.Delay(AltSvcBlocklistTimeoutInMilliseconds, altSvcBlocklistTimerCt)
.ContinueWith(t =>
{
_altSvcEnabled = true;
}, _altSvcBlocklistTimerCancellation.Token, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}, altSvcBlocklistTimerCt, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}
}

Expand All @@ -1337,8 +1362,8 @@ public void OnNetworkChanged()
if (_http3Authority != null && _persistAuthority == false)
{
ExpireAltSvcAuthority();
Debug.Assert(_authorityExpireTimer != null);
_authorityExpireTimer.Change(Timeout.Infinite, Timeout.Infinite);
Debug.Assert(_authorityExpireTimer != null || _disposed);
_authorityExpireTimer?.Change(Timeout.Infinite, Timeout.Infinite);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ public async Task ConnectTimeout_NotWrappedInMultipleTimeoutExceptions()
Assert.Contains("ConnectTimeout", connectTimeoutException.Message);

Assert.Null(connectTimeoutException.InnerException);
Assert.DoesNotContain("42", e.ToString());
Assert.DoesNotContain("HttpClient.Timeout", e.ToString());
Copy link
Member Author

@CarnaViire CarnaViire Jul 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @MihaZupan it failed because some line number in the stacktrace contained 42 😄

Copy link
Member

@MihaZupan MihaZupan Jul 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂️ Thanks for fixing this

}

[Fact]
Expand All @@ -836,7 +836,7 @@ public async Task UnknownOperationCanceledException_NotWrappedInATimeoutExceptio

Assert.Null(e.InnerException);
Assert.Equal("Foo", e.Message);
Assert.DoesNotContain("42", e.ToString());
Assert.DoesNotContain("HttpClient.Timeout", e.ToString());
}

[Fact]
Expand Down