Move QuicServerInfo management from CachedState to the QuicStreamFactory

net/quic/crypto/quic_crypto_client_config.h

 // Copyright 2013 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.
 
 #ifndef NET_QUIC_CRYPTO_QUIC_CRYPTO_CLIENT_CONFIG_H_
 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_CLIENT_CONFIG_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
 
 class ChannelIDSigner;
 class CryptoHandshakeMessage;
 class ProofVerifier;
 class ProofVerifyDetails;
 class QuicRandom;
-class QuicServerInfo;
-class QuicServerInfoFactory;
 
 // QuicCryptoClientConfig contains crypto-related configuration settings for a
 // client. Note that this object isn't thread-safe. It's designed to be used on
 // a single thread at a time.
 class NET_EXPORT_PRIVATE QuicCryptoClientConfig : public QuicCryptoConfig {
  public:
   // A CachedState contains the information that the client needs in order to
   // perform a 0-RTT handshake with a server. This information can be reused
   // over several connections to the same server.
   class NET_EXPORT_PRIVATE CachedState {
    public:
     CachedState();
-    explicit CachedState(scoped_ptr<QuicServerInfo> quic_server_info);
     ~CachedState();
 
     // IsComplete returns true if this object contains enough information to
     // perform a handshake with the server. |now| is used to judge whether any
     // cached server config has expired.
     bool IsComplete(QuicWallTime now) const;
 
     // IsEmpty returns true if |server_config_| is empty.
     bool IsEmpty() const;
 
@@ skipping 13 matching lines @@
     void InvalidateServerConfig();
 
     // SetProof stores a certificate chain and signature.
     void SetProof(const std::vector<std::string>& certs,
                   base::StringPiece signature);
 
     // Clears the certificate chain and signature and invalidates the proof.
     void ClearProof();
 
     // SetProofValid records that the certificate chain and signature have been
-    // validated and that it's safe to assume that the server is legitimate. It
-    // persists the server config information to disk cache.
+    // validated and that it's safe to assume that the server is legitimate.
     // (Note: this does not check the chain or signature.)
     void SetProofValid();
 
     // If the server config or the proof has changed then it needs to be
     // revalidated. Helper function to keep server_config_valid_ and
     // generation_counter_ in sync.
     void SetProofInvalid();
 
+    bool Initialize(base::StringPiece server_config,

[wtc, 2014/03/12 23:13:20]

Nit: if the Initialize method is similar to InitializeFrom, I suggest listing
them next to each other.

Please document what the bool return value means. Since InitializeFrom returns
void, I was surprised to see Initialize return bool.

Also, I am wondering why Initialize needs a |QuicWallTime now| input, but
InitializeFrom doesn't.

[Ryan Hamilton, 2014/03/13 16:38:07]

Done.
Good point.  I've added a comment.  The difference between the methods is that
Initialize() needs to parse and evaluate the server config, whereas
InitializeFrom simply copies whatever exists.

+                    base::StringPiece signature,
+                    base::StringPiece source_address_token,
+                    const std::vector<std::string>& certs,

[wtc, 2014/03/12 23:13:20]

I suggest listing the first four arguments in the same order as the
corresponding class members: server_config, source_address_token, certs,
signature.

If you reorder them, please be careful because three of the arguments have the
same type, so the compiler cannot distinguish between them if you make a
mistake.

[Ryan Hamilton, 2014/03/13 16:38:07]

Done.  However, the certs class member is actually 3rd, not 4th, so that made it
easier.

+                    QuicWallTime now);
+
     const std::string& server_config() const;
     const std::string& source_address_token() const;
     const std::vector<std::string>& certs() const;
     const std::string& signature() const;
     bool proof_valid() const;
     uint64 generation_counter() const;
     const ProofVerifyDetails* proof_verify_details() const;
-    QuicServerInfo* quic_server_info() const;
 
     void set_source_address_token(base::StringPiece token);
 
     // SetProofVerifyDetails takes ownership of |details|.
     void SetProofVerifyDetails(ProofVerifyDetails* details);
 
     // Copy the |server_config_|, |source_address_token_|, |certs_| and
     // |server_config_sig_| from the |other|.  The remaining fields,
     // |generation_counter_|, |proof_verify_details_|, and |scfg_| remain
     // unchanged.
     void InitializeFrom(const CachedState& other);
 
-    // Fill out the |server_config_|, |source_address_token_|, |certs_| and
-    // |server_config_sig_| fields from |quic_server_info_|. |quic_server_info_|
-    // reads this information from the disk cache. |now| is used to judge
-    // whether server config from disk cache has expired. Returns true if it has
-    // loaded the data from disk cache successfully.
-    bool LoadQuicServerInfo(QuicWallTime now);
-
-    // Save the server config information so that we can perform 0-RTT handshake
-    // with a server.
-    void SaveQuicServerInfo();
-
    private:
     std::string server_config_;         // A serialized handshake message.
     std::string source_address_token_;  // An opaque proof of IP ownership.
     std::vector<std::string> certs_;    // A list of certificates in leaf-first
                                         // order.
     std::string server_config_sig_;     // A signature of |server_config_|.
     bool server_config_valid_;          // True if |server_config_| is correctly
                                         // signed and |certs_| has been
                                         // validated.
-    bool need_to_persist_;              // Persist to disk if True.
     // Generation counter associated with the |server_config_|, |certs_| and
     // |server_config_sig_| combination. It is incremented whenever we set
     // server_config_valid_ to false.
     uint64 generation_counter_;
 
     scoped_ptr<ProofVerifyDetails> proof_verify_details_;
 
     // scfg contains the cached, parsed value of |server_config|.
     mutable scoped_ptr<CryptoHandshakeMessage> scfg_;
 
-    // |quic_server_info_| is used to fetch crypto config information from disk.
-    scoped_ptr<QuicServerInfo> quic_server_info_;
-
     DISALLOW_COPY_AND_ASSIGN(CachedState);
   };
 
   QuicCryptoClientConfig();
   ~QuicCryptoClientConfig();
 
   // Sets the members to reasonable, default values.
   void SetDefaults();
 
-  // Create returns a CachedState for the given hostname. It creates a
-  // CachedState and caches it. If |quic_server_info_factory| is not NULL, then
-  // it is used to create QuicServerInfo which is used to fetch crypto config
-  // information from disk for the given hostname.
-  CachedState* Create(const std::string& server_hostname,
-                      QuicServerInfoFactory* quic_server_info_factory);
-
   // LookupOrCreate returns a CachedState for the given hostname. If no such
   // CachedState currently exists, it will be created and cached.
-  // TODO(rtenneti): fix the server code and pass QuicServerInfoFactory as
-  // argument.
   CachedState* LookupOrCreate(const std::string& server_hostname);
 
   // FillInchoateClientHello sets |out| to be a CHLO message that elicits a
   // source-address token or SCFG from a server. If |cached| is non-NULL, the
   // source-address token will be taken from it. |out_params| is used in order
   // to store the cached certs that were sent as hints to the server in
   // |out_params->cached_certs|. |preferred_version| is the version of the
   // QUIC protocol that this client chose to use initially. This allows the
   // server to detect downgrade attacks.
   void FillInchoateClientHello(const std::string& server_hostname,
@@ skipping 79 matching lines @@
 
   scoped_ptr<ProofVerifier> proof_verifier_;
   scoped_ptr<ChannelIDSigner> channel_id_signer_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientConfig);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_CRYPTO_CLIENT_CONFIG_H_