Skip to content

[release/9.0-staging] Bugfix InvalidOperationException/IndexOutOfRangeException in HttpListener.EndGetContext #110695

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
merged 3 commits into from
Jan 10, 2025
Merged

[release/9.0-staging] Bugfix InvalidOperationException/IndexOutOfRangeException in HttpListener.EndGetContext #110695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29acebc
HttpListener fix: Operations that change non-concurrent collections m…
pjannesen Sep 13, 2024
e117443
Merge branch 'release/9.0-staging' into backport/pr-107804-to-release…
rokonec Jan 3, 2025
4ff0e40
Merge branch 'release/9.0-staging' into backport/pr-107804-to-release…
rokonec Jan 10, 2025
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
38 changes: 32 additions & 6 deletions src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public bool UnsafeConnectionNtlmAuthentication
{
return;
}
lock ((DisconnectResults as ICollection).SyncRoot)

var disconnectResults = DisconnectResults;
lock ((disconnectResults as ICollection).SyncRoot)
{
if (_unsafeConnectionNtlmAuthentication == value)
{
Expand All @@ -79,7 +81,7 @@ public bool UnsafeConnectionNtlmAuthentication
_unsafeConnectionNtlmAuthentication = value;
if (!value)
{
foreach (DisconnectAsyncResult result in DisconnectResults.Values)
foreach (DisconnectAsyncResult result in disconnectResults.Values)
{
result.AuthenticatedConnection = null;
}
Expand Down Expand Up @@ -694,7 +696,13 @@ public HttpListenerContext EndGetContext(IAsyncResult asyncResult)
// assurance that we do this only for NTLM/Negotiate is not here, but in the
// code that caches WindowsIdentity instances in the Dictionary.
DisconnectAsyncResult? disconnectResult;
DisconnectResults.TryGetValue(connectionId, out disconnectResult);

var disconnectResults = DisconnectResults;
lock ((disconnectResults as ICollection).SyncRoot)
{
disconnectResults.TryGetValue(connectionId, out disconnectResult);
}

if (UnsafeConnectionNtlmAuthentication)
{
if (authorizationHeader == null)
Expand Down Expand Up @@ -1327,7 +1335,12 @@ private static void RegisterForDisconnectNotification(HttpListenerSession sessio
// Need to make sure it's going to get returned before adding it to the hash. That way it'll be handled
// correctly in HandleAuthentication's finally.
disconnectResult = result;
session.Listener.DisconnectResults[connectionId] = disconnectResult;

var disconnectResults = session.Listener.DisconnectResults;
lock ((disconnectResults as ICollection).SyncRoot)
{
disconnectResults[connectionId] = disconnectResult;
}
}

if (statusCode == Interop.HttpApi.ERROR_SUCCESS && HttpListener.SkipIOCPCallbackOnSuccess)
Expand Down Expand Up @@ -1646,8 +1659,21 @@ private void HandleDisconnect()
{
HttpListener listener = _listenerSession.Listener;

if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"DisconnectResults {listener.DisconnectResults} removing for _connectionId: {_connectionId}");
listener.DisconnectResults.Remove(_connectionId);
var disconnectResults = listener.DisconnectResults;
if (NetEventSource.Log.IsEnabled())
{
string? results;
lock ((disconnectResults as ICollection).SyncRoot)
{
results = disconnectResults.ToString();
}
NetEventSource.Info(this, $"DisconnectResults {results} removing for _connectionId: {_connectionId}");
}

lock ((disconnectResults as ICollection).SyncRoot)
{
disconnectResults.Remove(_connectionId);
}

// Cached identity is disposed with the session context
Session?.Dispose();
Expand Down
Loading