Skip to content

Fix Kestrel host header mismatch handling when port in Url #59352

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 2 commits into from
Dec 9, 2024
Merged

Fix Kestrel host header mismatch handling when port in Url #59352

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec6c22
Fix Kestrel host header mismatch handling when port in Url
BrennanConroy Dec 6, 2024
e36d998
avoid some allocs
BrennanConroy Dec 6, 2024
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
Prev Previous commit
avoid some allocs
  • Loading branch information
@BrennanConroy
BrennanConroy committed Dec 6, 2024
commit e36d998456dcad050835702e857e764bddc94588
9 changes: 6 additions & 3 deletions src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,12 +643,15 @@ private void ValidateNonOriginHostHeader(string hostText)
// authority component, excluding any userinfo subcomponent and its "@"
// delimiter.

// Accessing authority always allocates, store it in a local to only allocate once
var authority = _absoluteRequestTarget!.Authority;

// System.Uri doesn't not tell us if the port was in the original string or not.
// When IsDefaultPort = true, we will allow Host: with or without the default port
if (hostText != _absoluteRequestTarget!.Authority)
if (hostText != authority)
{
if (!_absoluteRequestTarget.IsDefaultPort
|| hostText != $"{_absoluteRequestTarget.Authority}:{_absoluteRequestTarget.Port}")
|| hostText != $"{authority}:{_absoluteRequestTarget.Port}")
{
if (_context.ServiceContext.ServerOptions.AllowHostHeaderOverride)
{
Expand All @@ -657,7 +660,7 @@ private void ValidateNonOriginHostHeader(string hostText)
// see: https://datatracker.ietf.org/doc/html/rfc2616/#section-14.23
// A "host" without any trailing port information implies the default
// port for the service requested (e.g., "80" for an HTTP URL).
hostText = _absoluteRequestTarget.Authority;
hostText = authority;
HttpRequestHeaders.HeaderHost = hostText;
}
else
Expand Down
Loading