Cert - protobufs to serialize and deserialize CertVerifierCache.

net/cert/multi_threaded_cert_verifier.h

 // 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.
 
 #ifndef NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_
 #define NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 53 matching lines @@
              CRLSet* crl_set,
              CertVerifyResult* verify_result,
              const CompletionCallback& callback,
              scoped_ptr<Request>* out_req,
              const BoundNetLog& net_log) override;
 
   bool SupportsOCSPStapling() override;
 
  private:
   struct JobToRequestParamsComparator;
+  friend class CertVerifierCachePersister;

[Ryan Sleevi, 2016/04/16 00:36:15]

The design I suggested was so we could explicitly avoid this. We do not want the
two coupled - that's a circular dependency.

[ramant (doing other things), 2016/04/21 16:41:54]

Done.

+  friend class CertVerifierCachePersisterTest;
   friend class CertVerifierRequest;
   friend class CertVerifierJob;
   friend class MultiThreadedCertVerifierTest;
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, CacheHit);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, DifferentCACerts);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, InflightJoin);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, MultipleInflightJoin);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, CancelRequest);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest,
                            RequestParamsComparators);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest,
                            CertTrustAnchorProvider);
+  FRIEND_TEST_ALL_PREFIXES(CertVerifierCachePersisterTest, PersistCache);
+  FRIEND_TEST_ALL_PREFIXES(CertVerifierCachePersisterTest,
+                           PersistCacheExpiredEntry);
 
   // Input parameters of a certificate verification request.
   struct NET_EXPORT_PRIVATE RequestParams {
     RequestParams(const SHA1HashValue& cert_fingerprint_arg,
                   const SHA1HashValue& ca_fingerprint_arg,
                   const std::string& hostname_arg,
                   const std::string& ocsp_response_arg,
                   int flags_arg,
                   const CertificateList& additional_trust_anchors);
     RequestParams(const RequestParams& other);
+    RequestParams();

[Ryan Sleevi, 2016/04/16 00:36:15]

I'd like to avoid this, because it leaves RequestParams in an undefined state.

[ramant (doing other things), 2016/04/21 16:41:54]

Done.

     ~RequestParams();
 
     bool operator<(const RequestParams& other) const;
 
     std::string hostname;
     int flags;
     std::vector<SHA1HashValue> hash_values;
     // The time when verification started.
     // Note: This uses base::Time, rather than base::TimeTicks, to
     // account for system clock changes.
@@ skipping 10 matching lines @@
   };
 
   // Rather than having a single validity point along a monotonically increasing
   // timeline, certificate verification is based on falling within a range of
   // the certificate's NotBefore and NotAfter and based on what the current
   // system clock says (which may advance forwards or backwards as users correct
   // clock skew). CacheValidityPeriod and CacheExpirationFunctor are helpers to
   // ensure that expiration is measured both by the 'general' case (now + cache
   // TTL) and by whether or not significant enough clock skew was introduced
   // since the last verification.
-  struct CacheValidityPeriod {
+  struct NET_EXPORT_PRIVATE CacheValidityPeriod {
     explicit CacheValidityPeriod(const base::Time& now);
     CacheValidityPeriod(const base::Time& now, const base::Time& expiration);
 
     base::Time verification_time;
     base::Time expiration_time;
   };
 
-  struct CacheExpirationFunctor {
+  struct NET_EXPORT_PRIVATE CacheExpirationFunctor {
     // Returns true iff |now| is within the validity period of |expiration|.
     bool operator()(const CacheValidityPeriod& now,
                     const CacheValidityPeriod& expiration) const;
   };
 
   struct JobComparator {
     bool operator()(const CertVerifierJob* job1,
                     const CertVerifierJob* job2) const;
   };
 
   using JobSet = std::set<CertVerifierJob*, JobComparator>;
 
   typedef ExpiringCache<RequestParams, CachedResult, CacheValidityPeriod,
                         CacheExpirationFunctor> CertVerifierCache;
 
+  class NET_EXPORT CertVerifierCacheIterator {

[Ryan Sleevi, 2016/04/16 00:36:15]

NAMING: This is highly redundant naming; just Iterator is sufficient

[ramant (doing other things), 2016/04/21 16:41:54]

Done.

+   public:
+    explicit CertVerifierCacheIterator(
+        const MultiThreadedCertVerifier& verifier);
+    ~CertVerifierCacheIterator();
+
+    bool HasNext() const { return iterator_.HasNext(); }
+    void Advance() { iterator_.Advance(); }
+
+    const std::string& hostname() const {
+      const RequestParams& key = iterator_.key();
+      return key.hostname;
+    }
+    int flags() const {
+      const RequestParams& key = iterator_.key();
+      return key.flags;
+    }
+    const std::vector<SHA1HashValue>& hash_values() const {
+      const RequestParams& key = iterator_.key();
+      return key.hash_values;
+    }
+    const base::Time& start_time() const {
+      const RequestParams& key = iterator_.key();
+      return key.start_time;
+    }
+    int error() const {
+      const CachedResult& value = iterator_.value();
+      return value.error;
+    }
+    const CertVerifyResult& result() const {
+      const CachedResult& value = iterator_.value();
+      return value.result;
+    }
+    const base::Time& verification_time() const {
+      const CacheValidityPeriod& expiration = iterator_.expiration();
+      return expiration.verification_time;
+    }
+    const base::Time& expiration_time() const {
+      const CacheValidityPeriod& expiration = iterator_.expiration();
+      return expiration.expiration_time;
+    }
+
+   private:
+    CertVerifierCache::Iterator iterator_;
+  };
+
   // Saves |result| into the cache, keyed by |key|.
   void SaveResultToCache(const RequestParams& key, const CachedResult& result);
 
   // CertDatabase::Observer methods:
   void OnCACertChanged(const X509Certificate* cert) override;
 
   // Returns an inflight job for |key|. If there is no such job then returns
   // null.
   CertVerifierJob* FindJob(const RequestParams& key);
 
@@ skipping 21 matching lines @@
   scoped_refptr<CertVerifyProc> verify_proc_;
 
   CertTrustAnchorProvider* trust_anchor_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiThreadedCertVerifier);
 };
 
 }  // namespace net
 
 #endif  // NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_