Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Side by Side Diff: net/http/disk_cache_based_quic_server_info_unittest.cc

Issue 154933003: Persist server's crypto config data to disk cache for 0-RTT (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/disk_cache_based_quic_server_info.h"
6
7 #include <vector>
8
5 #include "base/bind.h" 9 #include "base/bind.h"
6 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
7 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
8 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
9 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
10 #include "net/http/disk_cache_based_quic_server_info.h"
11 #include "net/http/mock_http_cache.h" 14 #include "net/http/mock_http_cache.h"
12 #include "net/quic/crypto/quic_server_info.h" 15 #include "net/quic/crypto/quic_server_info.h"
13 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
14 17
15 namespace { 18 namespace {
16 19
17 // This is an empty transaction, needed to register the URL and the test mode. 20 // This is an empty transaction, needed to register the URL and the test mode.
18 const MockTransaction kHostInfoTransaction = { 21 const MockTransaction kHostInfoTransaction = {
19 "quicserverinfo:https://www.google.com", 22 "quicserverinfo:https://www.google.com",
20 "", 23 "",
(...skipping 12 matching lines...) Expand all
33 // Tests that we can delete a DiskCacheBasedQuicServerInfo object in a 36 // Tests that we can delete a DiskCacheBasedQuicServerInfo object in a
34 // completion callback for DiskCacheBasedQuicServerInfo::WaitForDataReady. 37 // completion callback for DiskCacheBasedQuicServerInfo::WaitForDataReady.
35 TEST(DiskCacheBasedQuicServerInfo, DeleteInCallback) { 38 TEST(DiskCacheBasedQuicServerInfo, DeleteInCallback) {
36 // Use the blocking mock backend factory to force asynchronous completion 39 // Use the blocking mock backend factory to force asynchronous completion
37 // of quic_server_info->WaitForDataReady(), so that the callback will run. 40 // of quic_server_info->WaitForDataReady(), so that the callback will run.
38 MockBlockingBackendFactory* factory = new MockBlockingBackendFactory(); 41 MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
39 MockHttpCache cache(factory); 42 MockHttpCache cache(factory);
40 scoped_ptr<net::QuicServerInfo> quic_server_info( 43 scoped_ptr<net::QuicServerInfo> quic_server_info(
41 new net::DiskCacheBasedQuicServerInfo("https://www.verisign.com", 44 new net::DiskCacheBasedQuicServerInfo("https://www.verisign.com",
42 cache.http_cache())); 45 cache.http_cache()));
46 string server_config;
47 string source_address_token;
48 std::vector<string> certs;
49 string server_config_sig;
50 net::QuicServerInfo::State* state = quic_server_info->mutable_state();
51 state->SetConfigData(&server_config, &source_address_token, &certs,
52 &server_config_sig);
53
43 quic_server_info->Start(); 54 quic_server_info->Start();
44 net::TestCompletionCallback callback; 55 net::TestCompletionCallback callback;
45 int rv = quic_server_info->WaitForDataReady(callback.callback()); 56 int rv = quic_server_info->WaitForDataReady(callback.callback());
46 EXPECT_EQ(net::ERR_IO_PENDING, rv); 57 EXPECT_EQ(net::ERR_IO_PENDING, rv);
47 // Now complete the backend creation and let the callback run. 58 // Now complete the backend creation and let the callback run.
48 factory->FinishCreation(); 59 factory->FinishCreation();
49 EXPECT_EQ(net::OK, callback.GetResult(rv)); 60 EXPECT_EQ(net::OK, callback.GetResult(rv));
50 } 61 }
51 62
52 // Tests the basic logic of storing, retrieving and updating data. 63 // Tests the basic logic of storing, retrieving and updating data.
53 TEST(DiskCacheBasedQuicServerInfo, Update) { 64 TEST(DiskCacheBasedQuicServerInfo, Update) {
54 MockHttpCache cache; 65 MockHttpCache cache;
55 AddMockTransaction(&kHostInfoTransaction); 66 AddMockTransaction(&kHostInfoTransaction);
56 net::TestCompletionCallback callback;
57 67
58 scoped_ptr<net::QuicServerInfo> quic_server_info( 68 scoped_ptr<net::QuicServerInfo> quic_server_info(
59 new net::DiskCacheBasedQuicServerInfo("https://www.google.com", 69 new net::DiskCacheBasedQuicServerInfo("https://www.google.com",
60 cache.http_cache())); 70 cache.http_cache()));
71 string server_config;
72 string source_address_token;
73 std::vector<string> certs;
74 string server_config_sig;
75 net::QuicServerInfo::State* state = quic_server_info->mutable_state();
76 state->SetConfigData(&server_config, &source_address_token, &certs,
77 &server_config_sig);
61 quic_server_info->Start(); 78 quic_server_info->Start();
79 net::TestCompletionCallback callback;
62 int rv = quic_server_info->WaitForDataReady(callback.callback()); 80 int rv = quic_server_info->WaitForDataReady(callback.callback());
63 EXPECT_EQ(net::OK, callback.GetResult(rv)); 81 EXPECT_EQ(net::OK, callback.GetResult(rv));
64 82
65 net::QuicServerInfo::State* state = quic_server_info->mutable_state(); 83 EXPECT_TRUE(state->certs->empty());
66 // TODO(rtenneti): Flesh out details of net::QuicServerInfo::State. 84 const string server_config_a = "server_config_a";
67 EXPECT_TRUE(state->data.empty()); 85 const string source_address_token_a = "source_address_token_a";
68 state->data.push_back(std::string("foo")); 86 const string server_config_sig_a = "server_config_sig_a";
87 const string cert_a = "cert_a";
88 const string cert_b = "cert_b";
89
90 server_config = server_config_a;
91 source_address_token = source_address_token_a;
92 server_config_sig = server_config_sig_a;
93 certs.push_back(cert_a);
69 quic_server_info->Persist(); 94 quic_server_info->Persist();
70 95
71 // Wait until Persist() does the work. 96 // Wait until Persist() does the work.
72 base::MessageLoop::current()->RunUntilIdle(); 97 base::MessageLoop::current()->RunUntilIdle();
73 98
74 // Open the stored net::QuicCryptoClientConfig::CachedState. 99 // Open the stored QuicServerInfo.
75 quic_server_info.reset( 100 quic_server_info.reset(
76 new net::DiskCacheBasedQuicServerInfo("https://www.google.com", 101 new net::DiskCacheBasedQuicServerInfo("https://www.google.com",
77 cache.http_cache())); 102 cache.http_cache()));
103 state = quic_server_info->mutable_state();
104 string server_config_2;
105 string source_address_token_2;
106 std::vector<string> certs_2;
107 string server_config_sig_2;
108 state->SetConfigData(&server_config_2, &source_address_token_2, &certs_2,
109 &server_config_sig_2);
78 quic_server_info->Start(); 110 quic_server_info->Start();
79 rv = quic_server_info->WaitForDataReady(callback.callback()); 111 rv = quic_server_info->WaitForDataReady(callback.callback());
80 EXPECT_EQ(net::OK, callback.GetResult(rv)); 112 EXPECT_EQ(net::OK, callback.GetResult(rv));
81 113
114 const net::QuicServerInfo::State& state1 = quic_server_info->state();
115 EXPECT_TRUE(quic_server_info->IsDataReady());
116 EXPECT_EQ(server_config_a, *state1.server_config);
117 EXPECT_EQ(source_address_token_a, *state1.source_address_token);
118 EXPECT_EQ(server_config_sig_a, *state1.server_config_sig);
119 EXPECT_EQ(1U, state1.certs->size());
120 EXPECT_EQ(cert_a, (*state1.certs)[0]);
121
82 // And now update the data. 122 // And now update the data.
83 state = quic_server_info->mutable_state(); 123 certs_2.push_back(cert_b);
84 // TODO(rtenneti): Flesh out details of net::QuicServerInfo::State.
85 // Verify the data after we implement save and restore of the data.
86 state->data.push_back(std::string("bar"));
87 124
88 // Fail instead of DCHECKing double creates. 125 // Fail instead of DCHECKing double creates.
89 cache.disk_cache()->set_double_create_check(false); 126 cache.disk_cache()->set_double_create_check(false);
90 quic_server_info->Persist(); 127 quic_server_info->Persist();
91 base::MessageLoop::current()->RunUntilIdle(); 128 base::MessageLoop::current()->RunUntilIdle();
92 129
93 // Verify that the state was updated. 130 // Verify that the state was updated.
94 quic_server_info.reset( 131 quic_server_info.reset(
95 new net::DiskCacheBasedQuicServerInfo("https://www.google.com", 132 new net::DiskCacheBasedQuicServerInfo("https://www.google.com",
96 cache.http_cache())); 133 cache.http_cache()));
134 state = quic_server_info->mutable_state();
135 string restored_server_config;
136 string restored_source_address_token;
137 std::vector<string> restored_certs;
138 string restored_server_config_sig;
139 state->SetConfigData(&restored_server_config, &restored_source_address_token,
140 &restored_certs, &restored_server_config_sig);
97 quic_server_info->Start(); 141 quic_server_info->Start();
98 rv = quic_server_info->WaitForDataReady(callback.callback()); 142 rv = quic_server_info->WaitForDataReady(callback.callback());
99 EXPECT_EQ(net::OK, callback.GetResult(rv)); 143 EXPECT_EQ(net::OK, callback.GetResult(rv));
100 144
101 state = quic_server_info->mutable_state(); 145 const net::QuicServerInfo::State& state2 = quic_server_info->state();
102 // TODO(rtenneti): Flesh out details of net::QuicServerInfo::State. 146 EXPECT_TRUE(quic_server_info->IsDataReady());
103 // Verify the data after we implement save and restore of the data. 147 EXPECT_EQ(server_config_a, *state2.server_config);
148 EXPECT_EQ(source_address_token_a, *state2.source_address_token);
149 EXPECT_EQ(server_config_sig_a, *state2.server_config_sig);
150 EXPECT_EQ(2U, state2.certs->size());
151 EXPECT_EQ(cert_a, (*state2.certs)[0]);
152 EXPECT_EQ(cert_b, (*state2.certs)[1]);
104 153
105 RemoveMockTransaction(&kHostInfoTransaction); 154 RemoveMockTransaction(&kHostInfoTransaction);
106 } 155 }
107 156
108 } // namespace 157 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698