Skip to content

[HTTP] Fix new header test #117202

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.

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
Jul 3, 2025
Merged
Changes from all commits
Commits
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
91 changes: 52 additions & 39 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2172,56 +2172,69 @@ public async Task SendAsync_InvalidRequestUri_Throws()
[InlineData('\u009F', HeaderType.Cookie)]
public async Task SendAsync_RequestWithDangerousControlHeaderValue_ThrowsHttpRequestException(char dangerousChar, HeaderType headerType)
{
string uri = "https://example.com"; // URI doesn't matter, the request should never leave the client
var handler = CreateHttpClientHandler();
TaskCompletionSource<bool> acceptConnection = new TaskCompletionSource<bool>();

var request = new HttpRequestMessage(HttpMethod.Get, uri);
request.Version = UseVersion;
try
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
{
switch (headerType)
var handler = CreateHttpClientHandler();

var request = new HttpRequestMessage(HttpMethod.Get, uri);
request.Version = UseVersion;
try
{
case HeaderType.Request:
request.Headers.Add("Custom-Header", $"HeaderValue{dangerousChar}WithControlChar");
break;
case HeaderType.Content:
request.Content = new StringContent("test content");
request.Content.Headers.Add("Custom-Content-Header", $"ContentValue{dangerousChar}WithControlChar");
break;
case HeaderType.Cookie:
switch (headerType)
{
case HeaderType.Request:
request.Headers.Add("Custom-Header", $"HeaderValue{dangerousChar}WithControlChar");
break;
case HeaderType.Content:
request.Content = new StringContent("test content");
request.Content.Headers.Add("Custom-Content-Header", $"ContentValue{dangerousChar}WithControlChar");
break;
case HeaderType.Cookie:
#if WINHTTPHANDLER_TEST
handler.CookieUsePolicy = CookieUsePolicy.UseSpecifiedCookieContainer;
handler.CookieUsePolicy = CookieUsePolicy.UseSpecifiedCookieContainer;
#endif
handler.CookieContainer = new CookieContainer();
handler.CookieContainer.Add(new Uri(uri), new Cookie("CustomCookie", $"Value{dangerousChar}WithControlChar"));
break;
handler.CookieContainer = new CookieContainer();
handler.CookieContainer.Add(uri, new Cookie("CustomCookie", $"Value{dangerousChar}WithControlChar"));
break;
}
}
catch (FormatException fex) when (fex.Message.Contains("New-line or NUL") && dangerousChar != '\u0100')
{
acceptConnection.SetResult(false);
return;
}
catch (CookieException) when (dangerousChar != '\u0100')
{
acceptConnection.SetResult(false);
return;
}
}
catch (FormatException fex) when (fex.Message.Contains("New-line or NUL") && dangerousChar != '\u0100')
{
return;
}
catch (CookieException) when (dangerousChar != '\u0100')
{
return;
}

using (var client = new HttpClient(handler))
{
var ex = await Assert.ThrowsAnyAsync<Exception>(() => client.SendAsync(request));
_output.WriteLine(ex.ToString());
if (IsWinHttpHandler)
using (var client = new HttpClient(handler))
{
var fex = Assert.IsType<FormatException>(ex);
Assert.Contains("Latin-1", fex.Message);
// WinHTTP validates the input before opening connection whereas SocketsHttpHandler opens connection first and validates only when writing to the wire.
acceptConnection.SetResult(!IsWinHttpHandler);
var ex = await Assert.ThrowsAnyAsync<Exception>(() => client.SendAsync(request));
if (IsWinHttpHandler)
{
var fex = Assert.IsType<FormatException>(ex);
Assert.Contains("Latin-1", fex.Message);
}
else
{
var hrex = Assert.IsType<HttpRequestException>(ex);
var message = UseVersion == HttpVersion30 ? hrex.InnerException.Message : hrex.Message;
Assert.Contains("ASCII", message);
}
}
else
}, async server =>
{
if (await acceptConnection.Task)
{
var hrex = Assert.IsType<HttpRequestException>(ex);
var message = UseVersion == HttpVersion30 ? hrex.InnerException.Message : hrex.Message;
Assert.Contains("ASCII", message);
await IgnoreExceptions(server.AcceptConnectionAsync(c => Task.CompletedTask));
}
}
});
}

[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))]
Expand Down
Loading