Move QuicServerInfo management from CachedState to the QuicStreamFactory

net/quic/quic_crypto_client_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_crypto_client_stream.h"
 
 #include "base/metrics/histogram.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/null_encrypter.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/crypto/proof_verifier_chromium.h"
 #include "net/quic/crypto/quic_server_info.h"
+#include "net/quic/crypto/quic_server_info.h"

[ramant (doing other things), 2014/03/12 00:50:56]

nit: line 16 could be deleted.

[Ryan Hamilton, 2014/03/12 04:00:45]

Done.

 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/ssl/ssl_info.h"
 
 namespace net {
 
 namespace {
 
 // Copies CertVerifyResult from |verify_details| to |cert_verify_result|.
@@ skipping 32 matching lines @@
   stream_->DoHandshakeLoop(NULL);
 
   // The ProofVerifier owns this object and will delete it when this method
   // returns.
 }
 
 void QuicCryptoClientStream::ProofVerifierCallbackImpl::Cancel() {
   stream_ = NULL;
 }
 
-
 QuicCryptoClientStream::QuicCryptoClientStream(
     const string& server_hostname,
     QuicSession* session,
     QuicCryptoClientConfig* crypto_config)
     : QuicCryptoStream(session),
       next_state_(STATE_IDLE),
       num_client_hellos_(0),
       crypto_config_(crypto_config),
       server_hostname_(server_hostname),
       generation_counter_(0),
@@ skipping 191 matching lines @@
             *in, session()->connection()->clock()->WallNow(), cached,
             &crypto_negotiated_params_, &error_details);
         if (error != QUIC_NO_ERROR) {
           CloseConnectionWithDetails(error, error_details);
           return;
         }
         if (!cached->proof_valid()) {
           ProofVerifier* verifier = crypto_config_->proof_verifier();
           if (!verifier) {
             // If no verifier is set then we don't check the certificates.
             cached->SetProofValid();

[ramant (doing other things), 2014/03/12 00:50:56]

nit: consider calling SaveQuicServerInfo from here? 

nit: minor optimization - should we avoid persisting the config to disk if the
config we have loaded from disk cache is valid and didn't change.

[Ryan Hamilton, 2014/03/12 04:00:45]

Done, and in the other places.  We should probably have test coverage of this
path.
Good idea.  I'll look into that!

           } else if (!cached->signature().empty()) {
             next_state_ = STATE_VERIFY_PROOF;
             break;
           }
         }
         next_state_ = STATE_SEND_CHLO;
         break;
       case STATE_VERIFY_PROOF: {
         ProofVerifier* verifier = crypto_config_->proof_verifier();
         DCHECK(verifier);
@@ skipping 117 matching lines @@
   }
 }
 
 void QuicCryptoClientStream::OnIOComplete(int result) {
   DCHECK_EQ(STATE_LOAD_QUIC_SERVER_INFO_COMPLETE, next_state_);
   DCHECK_NE(ERR_IO_PENDING, result);
   disk_cache_load_result_ = result;
   DoHandshakeLoop(NULL);
 }
 
+void QuicCryptoClientStream::SetQuicServerInfo(
+    scoped_ptr<QuicServerInfo> server_info) {
+  quic_server_info_.reset(server_info.release());
+}
+
 int QuicCryptoClientStream::DoLoadQuicServerInfo(
     QuicCryptoClientConfig::CachedState* cached) {
   next_state_ = STATE_SEND_CHLO;
-  QuicServerInfo* quic_server_info = cached->quic_server_info();
-  if (!quic_server_info) {
+  if (!quic_server_info_) {
     return OK;
   }
 
   read_start_time_ = base::TimeTicks::Now();
   generation_counter_ = cached->generation_counter();
   next_state_ = STATE_LOAD_QUIC_SERVER_INFO_COMPLETE;
 
   // TODO(rtenneti): Use host:port to access QUIC server information from disk
   // cache. If multiple tabs load URLs with same hostname but different
   // ports, all requests except for the first request send InchoateClientHello.
   // Fix the code to handle multiple requests. A possible solution is to wait
   // for the first request to finish and use the data from the disk cache for
   // all requests.
   // We may need to call quic_server_info->Persist later.
   // quic_server_info->Persist requires quic_server_info to be ready, so we
   // always call WaitForDataReady, even though we might have initialized
   // |cached| config from the cached state for a canonical hostname.
-  int rv = quic_server_info->WaitForDataReady(
+  int rv = quic_server_info_->WaitForDataReady(
       base::Bind(&QuicCryptoClientStream::OnIOComplete,
                  weak_factory_.GetWeakPtr()));
 
   if (rv != ERR_IO_PENDING) {
     disk_cache_load_result_ = rv;
   }
   return rv;
 }
 
 void QuicCryptoClientStream::DoLoadQuicServerInfoComplete(
     QuicCryptoClientConfig::CachedState* cached) {
   LoadQuicServerInfo(cached);
-  QuicServerInfo::State* state = cached->quic_server_info()->mutable_state();
+  QuicServerInfo::State* state = quic_server_info_->mutable_state();
   state->Clear();
 }
 
 void QuicCryptoClientStream::LoadQuicServerInfo(
     QuicCryptoClientConfig::CachedState* cached) {
   next_state_ = STATE_SEND_CHLO;
 
   // If someone else already saved a server config, we don't want to overwrite
   // it. Also, if someone else saved a server config and then cleared it (so
   // cached->IsEmpty() is true), we still want to load from QuicServerInfo.
   if (!cached->IsEmpty()) {
     return;
   }
 
   UMA_HISTOGRAM_TIMES("Net.QuicServerInfo.DiskCacheReadTime",
                       base::TimeTicks::Now() - read_start_time_);
 
-  if (disk_cache_load_result_ != OK || !cached->LoadQuicServerInfo(
-          session()->connection()->clock()->WallNow())) {
+  if (disk_cache_load_result_ != OK ||
+      !cached->Initialize(quic_server_info_->state().server_config,
+                          quic_server_info_->state().server_config_sig,
+                          quic_server_info_->state().source_address_token,
+                          quic_server_info_->state().certs,
+                          session()->connection()->clock()->WallNow())) {
     // It is ok to proceed to STATE_SEND_CHLO when we cannot load QuicServerInfo
     // from the disk cache.
     DCHECK(cached->IsEmpty());
     DVLOG(1) << "Empty server_config";
     return;
   }
 
   ProofVerifier* verifier = crypto_config_->proof_verifier();
   if (!verifier) {
     // If no verifier is set then we don't check the certificates.
     cached->SetProofValid();
   } else if (!cached->signature().empty()) {
     next_state_ = STATE_VERIFY_PROOF;
   }
 }
 
+void QuicCryptoClientStream::SaveQuicServerInfo(
+    QuicCryptoClientConfig::CachedState* cached) {
+  DCHECK(cached->proof_valid());
+
+  // If the QuicServerInfo hasn't managed to load from disk yet then we can't
+  // save anything. TODO(rtenneti): we should fix this.
+  if (!quic_server_info_->IsDataReady()) {
+    return;
+  }
+
+  QuicServerInfo::State* state = quic_server_info_->mutable_state();
+
+  state->server_config = cached->server_config();
+  state->source_address_token = cached->source_address_token();
+  state->server_config_sig = cached->signature();
+  state->certs = cached->certs();
+
+  quic_server_info_->Persist();
+}
+
 }  // namespace net