Skip to content

GitLab

T
tangled
Commit 9ae5b3b9 authored by rch's avatar rch Committed by Commit bot
Browse files
Options

Make QUIC tests use certs which are valid for the hosts they connect to. 

BUG=

Review URL: https://codereview.chromium.org/1680243005

Cr-Commit-Position: refs/heads/master@{#374803}
parent 12a05276
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 103 deletions
net/quic/quic_http_stream_test.cc
View file @ 9ae5b3b9
...@@ -60,7 +60,7 @@ namespace test { ...@@ -60,7 +60,7 @@ namespace test {
namespace { namespace {
const char kUploadData[] = "Really nifty data!"; const char kUploadData[] = "Really nifty data!";
const char kDefaultServerHostName[] = "www.google.com"; const char kDefaultServerHostName[] = "www.example.org";
const uint16_t kDefaultServerPort = 80; const uint16_t kDefaultServerPort = 80;
class TestQuicConnection : public QuicConnection { class TestQuicConnection : public QuicConnection {
...@@ -379,7 +379,7 @@ TEST_P(QuicHttpStreamTest, GetRequest) { ...@@ -379,7 +379,7 @@ TEST_P(QuicHttpStreamTest, GetRequest) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -428,7 +428,7 @@ TEST_P(QuicHttpStreamTest, GetRequestLargeResponse) { ...@@ -428,7 +428,7 @@ TEST_P(QuicHttpStreamTest, GetRequestLargeResponse) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -478,7 +478,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendRequest) { ...@@ -478,7 +478,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendRequest) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -498,7 +498,7 @@ TEST_P(QuicHttpStreamTest, GetSSLInfoAfterSessionClosed) { ...@@ -498,7 +498,7 @@ TEST_P(QuicHttpStreamTest, GetSSLInfoAfterSessionClosed) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -525,7 +525,7 @@ TEST_P(QuicHttpStreamTest, LogGranularQuicConnectionError) { ...@@ -525,7 +525,7 @@ TEST_P(QuicHttpStreamTest, LogGranularQuicConnectionError) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -555,7 +555,7 @@ TEST_P(QuicHttpStreamTest, DoNotLogGranularQuicErrorIfHandshakeNotConfirmed) { ...@@ -555,7 +555,7 @@ TEST_P(QuicHttpStreamTest, DoNotLogGranularQuicErrorIfHandshakeNotConfirmed) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -589,7 +589,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeReadResponseHeaders) { ...@@ -589,7 +589,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeReadResponseHeaders) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -623,7 +623,7 @@ TEST_P(QuicHttpStreamTest, SendPostRequest) { ...@@ -623,7 +623,7 @@ TEST_P(QuicHttpStreamTest, SendPostRequest) {
new UploadBytesElementReader(kUploadData, strlen(kUploadData)))); new UploadBytesElementReader(kUploadData, strlen(kUploadData))));
ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init(CompletionCallback())); ASSERT_EQ(OK, request_.upload_data_stream->Init(CompletionCallback()));
...@@ -685,7 +685,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequest) { ...@@ -685,7 +685,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequest) {
upload_data_stream.AppendData(kUploadData, chunk_size, false); upload_data_stream.AppendData(kUploadData, chunk_size, false);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init( ASSERT_EQ(OK, request_.upload_data_stream->Init(
TestCompletionCallback().callback())); TestCompletionCallback().callback()));
...@@ -752,7 +752,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithFinalEmptyDataPacket) { ...@@ -752,7 +752,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithFinalEmptyDataPacket) {
upload_data_stream.AppendData(kUploadData, chunk_size, false); upload_data_stream.AppendData(kUploadData, chunk_size, false);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init( ASSERT_EQ(OK, request_.upload_data_stream->Init(
TestCompletionCallback().callback())); TestCompletionCallback().callback()));
...@@ -814,7 +814,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithOneEmptyDataPacket) { ...@@ -814,7 +814,7 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithOneEmptyDataPacket) {
ChunkedUploadDataStream upload_data_stream(0); ChunkedUploadDataStream upload_data_stream(0);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init( ASSERT_EQ(OK, request_.upload_data_stream->Init(
TestCompletionCallback().callback())); TestCompletionCallback().callback()));
...@@ -874,7 +874,7 @@ TEST_P(QuicHttpStreamTest, DestroyedEarly) { ...@@ -874,7 +874,7 @@ TEST_P(QuicHttpStreamTest, DestroyedEarly) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, DEFAULT_PRIORITY, net_log_,
callback_.callback())); callback_.callback()));
...@@ -912,7 +912,7 @@ TEST_P(QuicHttpStreamTest, Priority) { ...@@ -912,7 +912,7 @@ TEST_P(QuicHttpStreamTest, Priority) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, MEDIUM, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, MEDIUM, net_log_,
callback_.callback())); callback_.callback()));
...@@ -961,7 +961,7 @@ TEST_P(QuicHttpStreamTest, CheckPriorityWithNoDelegate) { ...@@ -961,7 +961,7 @@ TEST_P(QuicHttpStreamTest, CheckPriorityWithNoDelegate) {
Initialize(); Initialize();
request_.method = "GET"; request_.method = "GET";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
EXPECT_EQ(OK, stream_->InitializeStream(&request_, MEDIUM, net_log_, EXPECT_EQ(OK, stream_->InitializeStream(&request_, MEDIUM, net_log_,
callback_.callback())); callback_.callback()));
...@@ -992,7 +992,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendHeadersComplete) { ...@@ -992,7 +992,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendHeadersComplete) {
ChunkedUploadDataStream upload_data_stream(0); ChunkedUploadDataStream upload_data_stream(0);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init( ASSERT_EQ(OK, request_.upload_data_stream->Init(
TestCompletionCallback().callback())); TestCompletionCallback().callback()));
...@@ -1016,7 +1016,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendBodyComplete) { ...@@ -1016,7 +1016,7 @@ TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendBodyComplete) {
upload_data_stream.AppendData(kUploadData, chunk_size, false); upload_data_stream.AppendData(kUploadData, chunk_size, false);
request_.method = "POST"; request_.method = "POST";
request_.url = GURL("http://www.google.com/"); request_.url = GURL("http://www.example.org/");
request_.upload_data_stream = &upload_data_stream; request_.upload_data_stream = &upload_data_stream;
ASSERT_EQ(OK, request_.upload_data_stream->Init( ASSERT_EQ(OK, request_.upload_data_stream->Init(
TestCompletionCallback().callback())); TestCompletionCallback().callback()));
......
net/quic/quic_network_transaction_unittest.cc
View file @ 9ae5b3b9
...@@ -72,7 +72,7 @@ static const char kQuicAlternativeService50pctHeader[] = ...@@ -72,7 +72,7 @@ static const char kQuicAlternativeService50pctHeader[] =
static const char kQuicAlternativeServiceDifferentPortHeader[] = static const char kQuicAlternativeServiceDifferentPortHeader[] =
"Alt-Svc: quic=\":137\"\r\n\r\n"; "Alt-Svc: quic=\":137\"\r\n\r\n";
const char kDefaultServerHostName[] = "mail.example.com"; const char kDefaultServerHostName[] = "mail.example.org";
} // namespace } // namespace
...@@ -205,7 +205,7 @@ class QuicNetworkTransactionTest ...@@ -205,7 +205,7 @@ class QuicNetworkTransactionTest
clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20)); clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20));
scoped_refptr<X509Certificate> cert( scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem")); ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem"));
verify_details_.cert_verify_result.verified_cert = cert; verify_details_.cert_verify_result.verified_cert = cert;
verify_details_.cert_verify_result.is_issued_by_known_root = true; verify_details_.cert_verify_result.is_issued_by_known_root = true;
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_);
...@@ -433,9 +433,9 @@ class QuicNetworkTransactionTest ...@@ -433,9 +433,9 @@ class QuicNetworkTransactionTest
params_.http_server_properties = http_server_properties_.GetWeakPtr(); params_.http_server_properties = http_server_properties_.GetWeakPtr();
params_.quic_supported_versions = SupportedVersions(GetParam()); params_.quic_supported_versions = SupportedVersions(GetParam());
for (const char* host : for (const char* host :
{kDefaultServerHostName, "www.example.com", "news.example.com", {kDefaultServerHostName, "www.example.org", "news.example.org",
"bar.example.com", "foo.example.com", "www.example.org", "bar.example.org", "foo.example.org", "invalid.example.org",
"invalid.example.org", "docs.example.org"}) { "mail.example.com"}) {
params_.quic_host_whitelist.insert(host); params_.quic_host_whitelist.insert(host);
} }
...@@ -603,7 +603,7 @@ INSTANTIATE_TEST_CASE_P(Version, ...@@ -603,7 +603,7 @@ INSTANTIATE_TEST_CASE_P(Version,
TEST_P(QuicNetworkTransactionTest, ForceQuic) { TEST_P(QuicNetworkTransactionTest, ForceQuic) {
params_.origin_to_force_quic_on = params_.origin_to_force_quic_on =
HostPortPair::FromString("mail.example.com:443"); HostPortPair::FromString("mail.example.org:443");
MockQuicData mock_quic_data; MockQuicData mock_quic_data;
mock_quic_data.AddWrite( mock_quic_data.AddWrite(
...@@ -670,7 +670,7 @@ TEST_P(QuicNetworkTransactionTest, ForceQuic) { ...@@ -670,7 +670,7 @@ TEST_P(QuicNetworkTransactionTest, ForceQuic) {
TEST_P(QuicNetworkTransactionTest, QuicProxy) { TEST_P(QuicNetworkTransactionTest, QuicProxy) {
params_.enable_quic_for_proxies = true; params_.enable_quic_for_proxies = true;
proxy_service_ = proxy_service_ =
ProxyService::CreateFixedFromPacResult("QUIC mail.example.com:70"); ProxyService::CreateFixedFromPacResult("QUIC mail.example.org:70");
MockQuicData mock_quic_data; MockQuicData mock_quic_data;
mock_quic_data.AddWrite( mock_quic_data.AddWrite(
...@@ -690,7 +690,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxy) { ...@@ -690,7 +690,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxy) {
// There is no need to set up an alternate protocol job, because // There is no need to set up an alternate protocol job, because
// no attempt will be made to speak to the proxy over TCP. // no attempt will be made to speak to the proxy over TCP.
request_.url = GURL("http://mail.example.com/"); request_.url = GURL("http://mail.example.org/");
CreateSession(); CreateSession();
SendRequestAndExpectQuicResponseFromProxyOnPort("hello!", 70); SendRequestAndExpectQuicResponseFromProxyOnPort("hello!", 70);
...@@ -701,7 +701,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxy) { ...@@ -701,7 +701,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxy) {
// connection through a QUIC proxy, the certificate exhibited by the proxy is // connection through a QUIC proxy, the certificate exhibited by the proxy is
// checked against the proxy hostname, not the origin hostname. // checked against the proxy hostname, not the origin hostname.
TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) { TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) {
const std::string origin_host = "news.example.com"; const std::string origin_host = "mail.example.com";
const std::string proxy_host = "www.example.org"; const std::string proxy_host = "www.example.org";
params_.enable_quic_for_proxies = true; params_.enable_quic_for_proxies = true;
...@@ -723,7 +723,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) { ...@@ -723,7 +723,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) {
mock_quic_data.AddSocketDataToFactory(&socket_factory_); mock_quic_data.AddSocketDataToFactory(&socket_factory_);
scoped_refptr<X509Certificate> cert( scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem")); ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem"));
ASSERT_TRUE(cert.get()); ASSERT_TRUE(cert.get());
// This certificate is valid for the proxy, but not for the origin. // This certificate is valid for the proxy, but not for the origin.
bool common_name_fallback_used; bool common_name_fallback_used;
...@@ -745,7 +745,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) { ...@@ -745,7 +745,7 @@ TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) {
TEST_P(QuicNetworkTransactionTest, ForceQuicWithErrorConnecting) { TEST_P(QuicNetworkTransactionTest, ForceQuicWithErrorConnecting) {
params_.origin_to_force_quic_on = params_.origin_to_force_quic_on =
HostPortPair::FromString("mail.example.com:443"); HostPortPair::FromString("mail.example.org:443");
MockQuicData mock_quic_data1; MockQuicData mock_quic_data1;
mock_quic_data1.AddRead(ASYNC, ERR_SOCKET_NOT_CONNECTED); mock_quic_data1.AddRead(ASYNC, ERR_SOCKET_NOT_CONNECTED);
...@@ -891,7 +891,7 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -891,7 +891,7 @@ TEST_P(QuicNetworkTransactionTest,
TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) { TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) {
MockRead http_reads[] = { MockRead http_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\"foo.example.com:443\", quic=\":444\"\r\n\r\n"), MockRead("Alt-Svc: quic=\"foo.example.org:443\", quic=\":444\"\r\n\r\n"),
MockRead("hello world"), MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -904,7 +904,7 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) { ...@@ -904,7 +904,7 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) {
QuicStreamOffset request_header_offset = 0; QuicStreamOffset request_header_offset = 0;
QuicStreamOffset response_header_offset = 0; QuicStreamOffset response_header_offset = 0;
// First QUIC request data. // First QUIC request data.
// Open a session to foo.example.com:443 using the first entry of the // Open a session to foo.example.org:443 using the first entry of the
// alternative service list. // alternative service list.
MockQuicData mock_quic_data; MockQuicData mock_quic_data;
mock_quic_data.AddWrite(ConstructRequestHeadersPacket( mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
...@@ -912,8 +912,8 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) { ...@@ -912,8 +912,8 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) {
GetRequestHeaders("GET", "https", "/"), &request_header_offset)); GetRequestHeaders("GET", "https", "/"), &request_header_offset));
std::string alt_svc_list = std::string alt_svc_list =
"quic=\"mail.example.com:444\", quic=\"foo.example.com:443\", " "quic=\"mail.example.org:444\", quic=\"foo.example.org:443\", "
"quic=\"bar.example.com:445\""; "quic=\"bar.example.org:445\"";
mock_quic_data.AddRead(ConstructResponseHeadersPacket( mock_quic_data.AddRead(ConstructResponseHeadersPacket(
1, kClientDataStreamId1, false, false, 1, kClientDataStreamId1, false, false,
GetResponseHeaders("200 OK", alt_svc_list), &response_header_offset)); GetResponseHeaders("200 OK", alt_svc_list), &response_header_offset));
...@@ -953,7 +953,7 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) { ...@@ -953,7 +953,7 @@ TEST_P(QuicNetworkTransactionTest, UseExistingAlternativeServiceForQuic) {
TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) { TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) {
MockRead http_reads[] = { MockRead http_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\"foo.example.com:443\", quic=\":446\"\r\n\r\n"), MockRead("Alt-Svc: quic=\"foo.example.org:443\", quic=\":446\"\r\n\r\n"),
MockRead("hello world"), MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -972,14 +972,14 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) { ...@@ -972,14 +972,14 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) {
MockQuicData mock_quic_data2; MockQuicData mock_quic_data2;
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_);
// First QUIC request data. // First QUIC request data.
// Open a QUIC session to foo.example.com:443. // Open a QUIC session to foo.example.org:443.
mock_quic_data.AddWrite(ConstructRequestHeadersPacket( mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
1, kClientDataStreamId1, true, true, 1, kClientDataStreamId1, true, true,
GetRequestHeaders("GET", "https", "/"), &request_header_offset)); GetRequestHeaders("GET", "https", "/"), &request_header_offset));
std::string alt_svc_list = std::string alt_svc_list =
"quic=\"bar.example.com:444\", quic=\"frog.example.com:445\", " "quic=\"bar.example.org:444\", quic=\"frog.example.org:445\", "
"quic=\"mail.example.com:446\""; "quic=\"mail.example.org:446\"";
// Response header from the server resets the alt_svc list for the origin. // Response header from the server resets the alt_svc list for the origin.
mock_quic_data.AddRead(ConstructResponseHeadersPacket( mock_quic_data.AddRead(ConstructResponseHeadersPacket(
1, kClientDataStreamId1, false, false, 1, kClientDataStreamId1, false, false,
...@@ -989,15 +989,15 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) { ...@@ -989,15 +989,15 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) {
mock_quic_data.AddWrite(ConstructAckPacket(2, 1)); mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
// Second QUIC request data. // Second QUIC request data.
// Existing QUIC session to foo.example.com is not viable from the updated // Existing QUIC session to foo.example.org is not viable from the updated
// alt_svc. Unable to pool the existing QUIC session. // alt_svc. Unable to pool the existing QUIC session.
// Open a new QUIC session to bar.example.com:443. // Open a new QUIC session to bar.example.org:443.
mock_quic_data2.AddWrite(ConstructRequestHeadersPacket( mock_quic_data2.AddWrite(ConstructRequestHeadersPacket(
1, kClientDataStreamId1, true, true, 1, kClientDataStreamId1, true, true,
GetRequestHeaders("GET", "https", "/"), &maker)); GetRequestHeaders("GET", "https", "/"), &maker));
alt_svc_list = alt_svc_list =
"quic=\"foo.example.com:443\", quic=\"mail.example.com:446\", " "quic=\"foo.example.org:443\", quic=\"mail.example.org:446\", "
"quic=\"bar.example.com:444\""; "quic=\"bar.example.org:444\"";
// Response header from the server resets the alt_svc list for the origin. // Response header from the server resets the alt_svc list for the origin.
mock_quic_data2.AddRead(ConstructResponseHeadersPacket( mock_quic_data2.AddRead(ConstructResponseHeadersPacket(
1, kClientDataStreamId1, false, false, 1, kClientDataStreamId1, false, false,
...@@ -1009,7 +1009,7 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) { ...@@ -1009,7 +1009,7 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) {
mock_quic_data2.AddRead(ASYNC, 0); // EOF mock_quic_data2.AddRead(ASYNC, 0); // EOF
// Third QUIC request data. // Third QUIC request data.
// Connection pooling, using the first existing session to foo.example.com // Connection pooling, using the first existing session to foo.example.org
mock_quic_data.AddWrite(ConstructRequestHeadersPacket( mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
3, kClientDataStreamId2, false, true, 3, kClientDataStreamId2, false, true,
GetRequestHeaders("GET", "https", "/"), &request_header_offset)); GetRequestHeaders("GET", "https", "/"), &request_header_offset));
...@@ -1043,14 +1043,13 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) { ...@@ -1043,14 +1043,13 @@ TEST_P(QuicNetworkTransactionTest, UseFirstExistingAlternativeServiceForQuic) {
// if this is also the first existing QUIC session. // if this is also the first existing QUIC session.
TEST_P(QuicNetworkTransactionTest, TEST_P(QuicNetworkTransactionTest,
UseSharedExistingAlternativeServiceForQuicWithValidCert) { UseSharedExistingAlternativeServiceForQuicWithValidCert) {
// Default cert is valid for the following origins: // Default cert is valid for *.example.org
// mail.example.com, mail.example.org, and www.example.org.
// HTTP data for request to mail.example.com. // HTTP data for request to www.example.org.
MockRead http_reads[] = { MockRead http_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\":443\"\r\n\r\n"), MockRead("Alt-Svc: quic=\":443\"\r\n\r\n"),
MockRead("hello world from mail.example.com"), MockRead("hello world from www.example.org"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -1062,7 +1061,7 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1062,7 +1061,7 @@ TEST_P(QuicNetworkTransactionTest,
// HTTP data for request to mail.example.org. // HTTP data for request to mail.example.org.
MockRead http_reads2[] = { MockRead http_reads2[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\":444\", quic=\"mail.example.com:443\"\r\n\r\n"), MockRead("Alt-Svc: quic=\":444\", quic=\"www.example.org:443\"\r\n\r\n"),
MockRead("hello world from mail.example.org"), MockRead("hello world from mail.example.org"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -1075,8 +1074,8 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1075,8 +1074,8 @@ TEST_P(QuicNetworkTransactionTest,
QuicStreamOffset request_header_offset = 0; QuicStreamOffset request_header_offset = 0;
QuicStreamOffset response_header_offset = 0; QuicStreamOffset response_header_offset = 0;
QuicTestPacketMaker maker(GetParam(), 0, clock_, kDefaultServerHostName); QuicTestPacketMaker maker(GetParam(), 0, clock_, "mail.example.org");
maker.set_hostname("mail.example.org"); maker_.set_hostname("www.example.org");
MockQuicData mock_quic_data; MockQuicData mock_quic_data;
// First QUIC request data. // First QUIC request data.
...@@ -1090,7 +1089,6 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1090,7 +1089,6 @@ TEST_P(QuicNetworkTransactionTest,
mock_quic_data.AddRead(ConstructDataPacket(2, kClientDataStreamId1, false, mock_quic_data.AddRead(ConstructDataPacket(2, kClientDataStreamId1, false,
true, 0, "hello from mail QUIC!")); true, 0, "hello from mail QUIC!"));
mock_quic_data.AddWrite(ConstructAckPacket(2, 1)); mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
// Second QUIC request data. // Second QUIC request data.
mock_quic_data.AddWrite(ConstructRequestHeadersPacket( mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
3, kClientDataStreamId2, false, true, 3, kClientDataStreamId2, false, true,
...@@ -1111,16 +1109,17 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1111,16 +1109,17 @@ TEST_P(QuicNetworkTransactionTest,
CreateSessionWithNextProtos(); CreateSessionWithNextProtos();
// Send two HTTP requests, responses set up alt-svc lists for the origins. // Send two HTTP requests, responses set up alt-svc lists for the origins.
SendRequestAndExpectHttpResponse("hello world from mail.example.com"); request_.url = GURL("https://www.example.org/");
SendRequestAndExpectHttpResponse("hello world from www.example.org");
request_.url = GURL("https://mail.example.org/"); request_.url = GURL("https://mail.example.org/");
SendRequestAndExpectHttpResponse("hello world from mail.example.org"); SendRequestAndExpectHttpResponse("hello world from mail.example.org");
// Open a QUIC session to mail.example.com:443 when making request // Open a QUIC session to mail.example.org:443 when making request
// to mail.example.com. // to mail.example.org.
request_.url = GURL("https://mail.example.com/"); request_.url = GURL("https://www.example.org/");
SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443); SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443);
// Uses the existing QUIC session when making request to mail.example.org. // Uses the existing QUIC session when making request to www.example.org.
request_.url = GURL("https://mail.example.org/"); request_.url = GURL("https://mail.example.org/");
SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443); SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443);
} }
...@@ -1130,15 +1129,14 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1130,15 +1129,14 @@ TEST_P(QuicNetworkTransactionTest,
// if the cert is NOT valid, should ignore this QUIC session. // if the cert is NOT valid, should ignore this QUIC session.
TEST_P(QuicNetworkTransactionTest, TEST_P(QuicNetworkTransactionTest,
DoNotUseSharedExistingAlternativeServiceForQuicWithInvalidCert) { DoNotUseSharedExistingAlternativeServiceForQuicWithInvalidCert) {
// Default cert is only valid for the following origins: // Default cert is valid *.example.org
// mail.example.com, mail.example.org, and www.example.org. // NOT valid for mail.example.com.
// NOT valid for docs.example.org.
// HTTP data for request to mail.example.com. // HTTP data for request to mail.example.org.
MockRead http_reads[] = { MockRead http_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\":443\"\r\n\r\n"), MockRead("Alt-Svc: quic=\":443\"\r\n\r\n"),
MockRead("hello world from mail.example.com"), MockRead("hello world from mail.example.org"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -1147,11 +1145,11 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1147,11 +1145,11 @@ TEST_P(QuicNetworkTransactionTest,
socket_factory_.AddSocketDataProvider(&http_data); socket_factory_.AddSocketDataProvider(&http_data);
socket_factory_.AddSSLSocketDataProvider(&ssl_data_); socket_factory_.AddSSLSocketDataProvider(&ssl_data_);
// HTTP data for request to docs.example.org. // HTTP data for request to mail.example.com.
MockRead http_reads2[] = { MockRead http_reads2[] = {
MockRead("HTTP/1.1 200 OK\r\n"), MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: quic=\":444\", quic=\"mail.example.com:443\"\r\n\r\n"), MockRead("Alt-Svc: quic=\":444\", quic=\"mail.example.org:443\"\r\n\r\n"),
MockRead("hello world from docs.example.org"), MockRead("hello world from mail.example.com"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead(ASYNC, OK)}; MockRead(ASYNC, OK)};
...@@ -1160,15 +1158,15 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1160,15 +1158,15 @@ TEST_P(QuicNetworkTransactionTest,
socket_factory_.AddSocketDataProvider(&http_data2); socket_factory_.AddSocketDataProvider(&http_data2);
socket_factory_.AddSSLSocketDataProvider(&ssl_data_); socket_factory_.AddSSLSocketDataProvider(&ssl_data_);
QuicTestPacketMaker maker(GetParam(), 0, clock_, kDefaultServerHostName); QuicTestPacketMaker maker(GetParam(), 0, clock_, "mail.example.org");
maker.set_hostname("docs.example.org"); maker.set_hostname("mail.example.com");
MockQuicData mock_quic_data; MockQuicData mock_quic_data;
MockQuicData mock_quic_data2; MockQuicData mock_quic_data2;
// Adding a valid cert for *.example.org but not mail.example.com. // Adding a valid cert for *.example.org but not mail.example.com.
ProofVerifyDetailsChromium verify_details; ProofVerifyDetailsChromium verify_details;
scoped_refptr<X509Certificate> cert( scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"));
verify_details.cert_verify_result.verified_cert = cert; verify_details.cert_verify_result.verified_cert = cert;
verify_details.cert_verify_result.is_issued_by_known_root = true; verify_details.cert_verify_result.is_issued_by_known_root = true;
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details); crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details);
...@@ -1207,17 +1205,17 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1207,17 +1205,17 @@ TEST_P(QuicNetworkTransactionTest,
CreateSessionWithNextProtos(); CreateSessionWithNextProtos();
// Send HTTP requests, responses set up the alt-svc lists for the origins. // Send HTTP requests, responses set up the alt-svc lists for the origins.
SendRequestAndExpectHttpResponse("hello world from mail.example.org");
request_.url = GURL("https://mail.example.com/");
SendRequestAndExpectHttpResponse("hello world from mail.example.com"); SendRequestAndExpectHttpResponse("hello world from mail.example.com");
request_.url = GURL("https://docs.example.org/");
SendRequestAndExpectHttpResponse("hello world from docs.example.org");
// Open a QUIC session to mail.example.com:443 when making request // Open a QUIC session to mail.example.org:443 when making request
// to mail.example.com. // to mail.example.org.
request_.url = GURL("https://mail.example.com/"); request_.url = GURL("https://mail.example.org/");
SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443); SendRequestAndExpectQuicResponseOnPort("hello from mail QUIC!", 443);
// Open another new QUIC session to docs.example.org:444. // Open another new QUIC session to mail.example.com:444.
request_.url = GURL("https://docs.example.org/"); request_.url = GURL("https://mail.example.com/");
SendRequestAndExpectQuicResponseOnPort("hello from docs QUIC!", 444); SendRequestAndExpectQuicResponseOnPort("hello from docs QUIC!", 444);
} }
...@@ -1650,8 +1648,7 @@ class QuicAltSvcCertificateVerificationTest ...@@ -1650,8 +1648,7 @@ class QuicAltSvcCertificateVerificationTest
: public QuicNetworkTransactionTest { : public QuicNetworkTransactionTest {
public: public:
void Run(bool valid) { void Run(bool valid) {
HostPortPair origin(valid ? "mail.example.org" : "invalid.example.org", HostPortPair origin(valid ? "mail.example.org" : "mail.example.com", 443);
443);
HostPortPair alternative("www.example.org", 443); HostPortPair alternative("www.example.org", 443);
std::string url("https://"); std::string url("https://");
url.append(origin.host()); url.append(origin.host());
...@@ -1672,7 +1669,7 @@ class QuicAltSvcCertificateVerificationTest ...@@ -1672,7 +1669,7 @@ class QuicAltSvcCertificateVerificationTest
mock_quic_data.AddSocketDataToFactory(&socket_factory_); mock_quic_data.AddSocketDataToFactory(&socket_factory_);
scoped_refptr<X509Certificate> cert( scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem")); ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem"));
ASSERT_TRUE(cert.get()); ASSERT_TRUE(cert.get());
bool common_name_fallback_used; bool common_name_fallback_used;
EXPECT_EQ(valid, EXPECT_EQ(valid,
...@@ -1735,7 +1732,7 @@ TEST_P(QuicNetworkTransactionTest, HungAlternateProtocol) { ...@@ -1735,7 +1732,7 @@ TEST_P(QuicNetworkTransactionTest, HungAlternateProtocol) {
MockWrite http_writes[] = { MockWrite http_writes[] = {
MockWrite(SYNCHRONOUS, 0, "GET / HTTP/1.1\r\n"), MockWrite(SYNCHRONOUS, 0, "GET / HTTP/1.1\r\n"),
MockWrite(SYNCHRONOUS, 1, "Host: mail.example.com\r\n"), MockWrite(SYNCHRONOUS, 1, "Host: mail.example.org\r\n"),
MockWrite(SYNCHRONOUS, 2, "Connection: keep-alive\r\n\r\n")}; MockWrite(SYNCHRONOUS, 2, "Connection: keep-alive\r\n\r\n")};
MockRead http_reads[] = { MockRead http_reads[] = {
...@@ -1824,9 +1821,9 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithNoHttpRace) { ...@@ -1824,9 +1821,9 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithNoHttpRace) {
// without racing an HTTP connection, we need the host resolution to happen // without racing an HTTP connection, we need the host resolution to happen
// synchronously. // synchronously.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
...@@ -1841,8 +1838,8 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) { ...@@ -1841,8 +1838,8 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) {
// Since we are using a proxy, the QUIC job will not succeed. // Since we are using a proxy, the QUIC job will not succeed.
MockWrite http_writes[] = { MockWrite http_writes[] = {
MockWrite(SYNCHRONOUS, 0, "GET http://mail.example.com/ HTTP/1.1\r\n"), MockWrite(SYNCHRONOUS, 0, "GET http://mail.example.org/ HTTP/1.1\r\n"),
MockWrite(SYNCHRONOUS, 1, "Host: mail.example.com\r\n"), MockWrite(SYNCHRONOUS, 1, "Host: mail.example.org\r\n"),
MockWrite(SYNCHRONOUS, 2, "Proxy-Connection: keep-alive\r\n\r\n")}; MockWrite(SYNCHRONOUS, 2, "Proxy-Connection: keep-alive\r\n\r\n")};
MockRead http_reads[] = { MockRead http_reads[] = {
...@@ -1858,14 +1855,14 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) { ...@@ -1858,14 +1855,14 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) {
// without racing an HTTP connection, we need the host resolution to happen // without racing an HTTP connection, we need the host resolution to happen
// synchronously. // synchronously.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
request_.url = GURL("http://mail.example.com/"); request_.url = GURL("http://mail.example.org/");
CreateSessionWithNextProtos(); CreateSessionWithNextProtos();
AddQuicAlternateProtocolMapping(MockCryptoClientStream::ZERO_RTT); AddQuicAlternateProtocolMapping(MockCryptoClientStream::ZERO_RTT);
SendRequestAndExpectHttpResponse("hello world"); SendRequestAndExpectHttpResponse("hello world");
...@@ -1894,9 +1891,9 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithConfirmationRequired) { ...@@ -1894,9 +1891,9 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithConfirmationRequired) {
// connection to the the server, in this test we require confirmation // connection to the the server, in this test we require confirmation
// before encrypting so the HTTP job will still start. // before encrypting so the HTTP job will still start.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
...@@ -1940,9 +1937,9 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1940,9 +1937,9 @@ TEST_P(QuicNetworkTransactionTest,
// connection to the the server, in this test we require confirmation // connection to the the server, in this test we require confirmation
// before encrypting so the HTTP job will still start. // before encrypting so the HTTP job will still start.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
...@@ -1995,9 +1992,9 @@ TEST_P(QuicNetworkTransactionTest, ...@@ -1995,9 +1992,9 @@ TEST_P(QuicNetworkTransactionTest,
// connection to the the server, in this test we require confirmation // connection to the the server, in this test we require confirmation
// before encrypting so the HTTP job will still start. // before encrypting so the HTTP job will still start.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
...@@ -2225,9 +2222,9 @@ TEST_P(QuicNetworkTransactionTest, ConnectionCloseDuringConnect) { ...@@ -2225,9 +2222,9 @@ TEST_P(QuicNetworkTransactionTest, ConnectionCloseDuringConnect) {
// without racing an HTTP connection, we need the host resolution to happen // without racing an HTTP connection, we need the host resolution to happen
// synchronously. // synchronously.
host_resolver_.set_synchronous_mode(true); host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule("mail.example.com", "192.168.0.1", host_resolver_.rules()->AddIPLiteralRule("mail.example.org", "192.168.0.1",
""); "");
HostResolver::RequestInfo info(HostPortPair("mail.example.com", 443)); HostResolver::RequestInfo info(HostPortPair("mail.example.org", 443));
AddressList address; AddressList address;
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(), host_resolver_.Resolve(info, DEFAULT_PRIORITY, &address, CompletionCallback(),
nullptr, net_log_.bound()); nullptr, net_log_.bound());
...@@ -2262,7 +2259,7 @@ TEST_P(QuicNetworkTransactionTest, SecureResourceOverSecureQuic) { ...@@ -2262,7 +2259,7 @@ TEST_P(QuicNetworkTransactionTest, SecureResourceOverSecureQuic) {
TEST_P(QuicNetworkTransactionTest, QuicUpload) { TEST_P(QuicNetworkTransactionTest, QuicUpload) {
params_.origin_to_force_quic_on = params_.origin_to_force_quic_on =
HostPortPair::FromString("mail.example.com:443"); HostPortPair::FromString("mail.example.org:443");
MockRead reads[] = {MockRead(SYNCHRONOUS, ERR_IO_PENDING, 0)}; MockRead reads[] = {MockRead(SYNCHRONOUS, ERR_IO_PENDING, 0)};
MockWrite writes[] = {MockWrite(SYNCHRONOUS, ERR_FAILED, 1)}; MockWrite writes[] = {MockWrite(SYNCHRONOUS, ERR_FAILED, 1)};
......
net/quic/test_tools/mock_crypto_client_stream.cc
View file @ 9ae5b3b9
...@@ -20,13 +20,14 @@ MockCryptoClientStream::MockCryptoClientStream( ...@@ -20,13 +20,14 @@ MockCryptoClientStream::MockCryptoClientStream(
ProofVerifyContext* verify_context, ProofVerifyContext* verify_context,
QuicCryptoClientConfig* crypto_config, QuicCryptoClientConfig* crypto_config,
HandshakeMode handshake_mode, HandshakeMode handshake_mode,
const ProofVerifyDetails* proof_verify_details) const ProofVerifyDetailsChromium* proof_verify_details)
: QuicCryptoClientStream(server_id, : QuicCryptoClientStream(server_id,
session, session,
verify_context, verify_context,
crypto_config, crypto_config,
session), session),
handshake_mode_(handshake_mode), handshake_mode_(handshake_mode),
server_id_(server_id),
proof_verify_details_(proof_verify_details) {} proof_verify_details_(proof_verify_details) {}
MockCryptoClientStream::~MockCryptoClientStream() {} MockCryptoClientStream::~MockCryptoClientStream() {}
...@@ -38,6 +39,17 @@ void MockCryptoClientStream::OnHandshakeMessage( ...@@ -38,6 +39,17 @@ void MockCryptoClientStream::OnHandshakeMessage(
} }
void MockCryptoClientStream::CryptoConnect() { void MockCryptoClientStream::CryptoConnect() {
if (proof_verify_details_) {
bool unused = false;
if (!proof_verify_details_->cert_verify_result.verified_cert
->VerifyNameMatch(server_id_.host(), &unused)) {
handshake_confirmed_ = false;
encryption_established_ = false;
session()->connection()->CloseConnection(QUIC_PROOF_INVALID, false);
return;
}
}
switch (handshake_mode_) { switch (handshake_mode_) {
case ZERO_RTT: { case ZERO_RTT: {
encryption_established_ = true; encryption_established_ = true;
......
net/quic/test_tools/mock_crypto_client_stream.h
View file @ 9ae5b3b9
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/crypto_handshake.h"
#include "net/quic/crypto/crypto_protocol.h" #include "net/quic/crypto/crypto_protocol.h"
#include "net/quic/crypto/proof_verifier_chromium.h"
#include "net/quic/quic_client_session_base.h" #include "net/quic/quic_client_session_base.h"
#include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_crypto_client_stream.h"
#include "net/quic/quic_session.h" #include "net/quic/quic_session.h"
...@@ -37,12 +38,13 @@ class MockCryptoClientStream : public QuicCryptoClientStream { ...@@ -37,12 +38,13 @@ class MockCryptoClientStream : public QuicCryptoClientStream {
COLD_START, COLD_START,
}; };
MockCryptoClientStream(const QuicServerId& server_id, MockCryptoClientStream(
QuicClientSessionBase* session, const QuicServerId& server_id,
ProofVerifyContext* verify_context, QuicClientSessionBase* session,
QuicCryptoClientConfig* crypto_config, ProofVerifyContext* verify_context,
HandshakeMode handshake_mode, QuicCryptoClientConfig* crypto_config,
const ProofVerifyDetails* proof_verify_details_); HandshakeMode handshake_mode,
const ProofVerifyDetailsChromium* proof_verify_details_);
~MockCryptoClientStream() override; ~MockCryptoClientStream() override;
// CryptoFramerVisitorInterface implementation. // CryptoFramerVisitorInterface implementation.
...@@ -60,7 +62,8 @@ class MockCryptoClientStream : public QuicCryptoClientStream { ...@@ -60,7 +62,8 @@ class MockCryptoClientStream : public QuicCryptoClientStream {
private: private:
void SetConfigNegotiated(); void SetConfigNegotiated();
const ProofVerifyDetails* proof_verify_details_; const QuicServerId server_id_;
const ProofVerifyDetailsChromium* proof_verify_details_;
DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStream); DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStream);
}; };
......
net/quic/test_tools/mock_crypto_client_stream_factory.cc
View file @ 9ae5b3b9
...@@ -25,7 +25,7 @@ MockCryptoClientStreamFactory::CreateQuicCryptoClientStream( ...@@ -25,7 +25,7 @@ MockCryptoClientStreamFactory::CreateQuicCryptoClientStream(
QuicChromiumClientSession* session, QuicChromiumClientSession* session,
scoped_ptr<ProofVerifyContext> /*proof_verify_context*/, scoped_ptr<ProofVerifyContext> /*proof_verify_context*/,
QuicCryptoClientConfig* crypto_config) { QuicCryptoClientConfig* crypto_config) {
const ProofVerifyDetails* proof_verify_details = nullptr; const ProofVerifyDetailsChromium* proof_verify_details = nullptr;
if (!proof_verify_details_queue_.empty()) { if (!proof_verify_details_queue_.empty()) {
proof_verify_details = proof_verify_details_queue_.front(); proof_verify_details = proof_verify_details_queue_.front();
proof_verify_details_queue_.pop(); proof_verify_details_queue_.pop();
......
net/quic/test_tools/mock_crypto_client_stream_factory.h
View file @ 9ae5b3b9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <string> #include <string>
#include "base/macros.h" #include "base/macros.h"
#include "net/quic/crypto/proof_verifier_chromium.h"
#include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_crypto_client_stream.h"
#include "net/quic/quic_crypto_client_stream_factory.h" #include "net/quic/quic_crypto_client_stream_factory.h"
#include "net/quic/test_tools/mock_crypto_client_stream.h" #include "net/quic/test_tools/mock_crypto_client_stream.h"
...@@ -34,7 +35,8 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory { ...@@ -34,7 +35,8 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory {
} }
// The caller keeps ownership of |proof_verify_details|. // The caller keeps ownership of |proof_verify_details|.
void AddProofVerifyDetails(const ProofVerifyDetails* proof_verify_details) { void AddProofVerifyDetails(
const ProofVerifyDetailsChromium* proof_verify_details) {
proof_verify_details_queue_.push(proof_verify_details); proof_verify_details_queue_.push(proof_verify_details);
} }
...@@ -43,7 +45,7 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory { ...@@ -43,7 +45,7 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory {
private: private:
MockCryptoClientStream::HandshakeMode handshake_mode_; MockCryptoClientStream::HandshakeMode handshake_mode_;
MockCryptoClientStream* last_stream_; MockCryptoClientStream* last_stream_;
std::queue<const ProofVerifyDetails*> proof_verify_details_queue_; std::queue<const ProofVerifyDetailsChromium*> proof_verify_details_queue_;
DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStreamFactory); DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStreamFactory);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment