Skip to content

Use IndexOfAny in HttpListener.HandleAuthentication #71137

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
stephentoub merged 2 commits into from
Jun 23, 2022
Merged

Use IndexOfAny in HttpListener.HandleAuthentication #71137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4520e25
Use IndexOfAny in HttpListener.HandleAuthentication
stephentoub Jun 22, 2022
1724769
Fix missing check
stephentoub Jun 22, 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
9 changes: 3 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 @@ -803,13 +803,10 @@ public HttpListenerContext EndGetContext(IAsyncResult asyncResult)
if (authorizationHeader != null && (authenticationScheme & ~AuthenticationSchemes.Anonymous) != AuthenticationSchemes.None)
{
// Find the end of the scheme name. Trust that HTTP.SYS parsed out just our header ok.
for (index = 0; index < authorizationHeader.Length; index++)
index = authorizationHeader.AsSpan().IndexOfAny(" \t\r\n");
if (index < 0)
{
if (authorizationHeader[index] == ' ' || authorizationHeader[index] == '\t' ||
authorizationHeader[index] == '\r' || authorizationHeader[index] == '\n')
{
break;
}
index = authorizationHeader.Length;
Copy link
Member

@wfurt wfurt Jun 22, 2022

Choose a reason for hiding this comment

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

This will work. But I think this is only used in the condition bellow to guard if any character was found. e.g. you can simplify that without assignment as

-  if (index < authorizationHeader.Length)
+  if (index >= 0)

Copy link
Member Author

@stephentoub stephentoub Jun 22, 2022

Choose a reason for hiding this comment

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

index is also referenced later in the method.

Copy link
Member

@wfurt wfurt Jun 22, 2022

Choose a reason for hiding this comment

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

yeah, I missed that reading it on GH. However, without going to the first block, headerScheme should remain AuthenticationSchemes.None and we will error out without reaching the next index use. Not sure if HttpListener is worth of any more troubles.

}

// Currently only allow one Authorization scheme/header per request.
Expand Down