Skip to content

Don't access CookieContainer unless needed #16619

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 4 commits into from
Nov 1, 2019
Merged

Don't access CookieContainer unless needed #16619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6853b8a
Don't access CookieContainer unless needed
BrennanConroy Oct 28, 2019
bd6438f
Apply suggestions from code review
BrennanConroy Oct 28, 2019
9b8e73a
Update src/SignalR/clients/csharp/Http.Connections.Client/src/HttpCon…
BrennanConroy Oct 31, 2019
8538ba9
test
BrennanConroy Oct 31, 2019
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
8 changes: 8 additions & 0 deletions src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ await WithConnectionAsync(
Assert.Same(httpOptions.Credentials, httpClientHandler.Credentials);
}

[Fact]
public void HttpOptionsCannotSetNullCookieContainer()
{
var httpOptions = new HttpConnectionOptions();
Assert.NotNull(httpOptions.Cookies);
Assert.Throws<ArgumentNullException>(() => httpOptions.Cookies = null);
}

[Fact]
public async Task HttpRequestAndErrorResponseLogged()
{
Expand Down
9 changes: 5 additions & 4 deletions src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,14 @@ private HttpClient CreateHttpClient()
{
httpClientHandler.Proxy = _httpConnectionOptions.Proxy;
}
if (_httpConnectionOptions.Cookies != null)

// Only access HttpClientHandler.ClientCertificates and HttpClientHandler.CookieContainer
// if the user has configured those options
// Some variants of Mono do not support client certs or cookies and will throw NotImplementedException
if (_httpConnectionOptions.Cookies.Count > 0)
{
httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;
}

// Only access HttpClientHandler.ClientCertificates if the user has configured client certs
// Mono does not support client certs and will throw NotImplementedException
// https://github.com/aspnet/SignalR/issues/2232
var clientCertificates = _httpConnectionOptions.ClientCertificates;
if (clientCertificates?.Count > 0)
Expand Down