Skip to content

Store status code in exception for ProxyTunnelError #105610

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 5 commits into from
Jul 31, 2024
Merged

Store status code in exception for ProxyTunnelError #105610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d7b99b
Store status code in exception for ProxyTunnelError
stephentoub Jul 29, 2024
c847c79
Merge branch 'main' into proxytunnelstatus
stephentoub Jul 30, 2024
ba2aaef
Add test asserts
stephentoub Jul 30, 2024
ceb6234
Merge branch 'main' into proxytunnelstatus
stephentoub Jul 31, 2024
1f3e702
Fix tests for WinHttpHandler
stephentoub Jul 31, 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
12 changes: 10 additions & 2 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Proxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,11 @@ public async Task AuthenticatedProxyTunnelRequest_PostAsyncWithNoCreds_Throws()
using (HttpClient client = CreateHttpClient(handler))
{
HttpRequestException e = await Assert.ThrowsAnyAsync<HttpRequestException>(async () => await client.PostAsync("https://nosuchhost.invalid", new StringContent(content)));
Assert.Contains("407", e.Message);
Assert.Contains(((int)HttpStatusCode.ProxyAuthenticationRequired).ToString(), e.Message);
#if !WINHTTPHANDLER_TEST
Assert.Equal(HttpStatusCode.ProxyAuthenticationRequired, e.StatusCode);
Assert.Equal(HttpRequestError.ProxyTunnelError, e.HttpRequestError);
#endif
}
}
}
Expand All @@ -313,7 +317,11 @@ public async Task Proxy_SslProxyUnsupported_Throws()
{
handler.Proxy = new WebProxy($"https://{Guid.NewGuid():N}");

await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync($"http://{Guid.NewGuid():N}"));
HttpRequestException e = await Assert.ThrowsAsync<HttpRequestException>(() => client.GetAsync($"http://{Guid.NewGuid():N}"));
#if !WINHTTPHANDLER_TEST
Assert.Null(e.StatusCode);
Assert.Equal(HttpRequestError.ProxyTunnelError, e.HttpRequestError);
#endif
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...stem.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionPool/HttpConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ private async ValueTask<Stream> EstablishProxyTunnelAsync(bool async, Cancellati
if (tunnelResponse.StatusCode != HttpStatusCode.OK)
{
tunnelResponse.Dispose();
throw new HttpRequestException(HttpRequestError.ProxyTunnelError, SR.Format(SR.net_http_proxy_tunnel_returned_failure_status_code, _proxyUri, (int)tunnelResponse.StatusCode));
throw new HttpRequestException(HttpRequestError.ProxyTunnelError, SR.Format(SR.net_http_proxy_tunnel_returned_failure_status_code, _proxyUri, (int)tunnelResponse.StatusCode), statusCode: tunnelResponse.StatusCode);
}

try
Expand Down