| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/cert/caching_cert_verifier.h" | 5 #include "net/cert/caching_cert_verifier.h" |
| 6 | 6 |
| 7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "net/base/net_errors.h" | 8 #include "net/base/net_errors.h" |
| 9 #include "net/cert/cert_trust_anchor_provider.h" | 9 #include "net/cert/cert_trust_anchor_provider.h" |
| 10 | 10 |
| 11 namespace net { | 11 namespace net { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 // The maximum number of cache entries to use for the ExpiringCache. | 15 // The maximum number of cache entries to use for the ExpiringCache. |
| 16 const unsigned kMaxCacheEntries = 256; | 16 const unsigned kMaxCacheEntries = 256; |
| 17 | 17 |
| 18 // The number of seconds to cache entries. | 18 // The number of seconds to cache entries. |
| 19 const unsigned kTTLSecs = 1800; // 30 minutes. | 19 const unsigned kTTLSecs = 1800; // 30 minutes. |
| 20 | 20 |
| 21 } // namespace | 21 } // namespace |
| 22 | 22 |
| 23 CachingCertVerifier::Iterator::Iterator(const CachingCertVerifier& verifier) |
| 24 : iter_(nullptr) { |
| 25 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 26 iter_ = reinterpret_cast<void*>(new Iter(verifier.cache_)); |
| 27 } |
| 28 |
| 29 CachingCertVerifier::Iterator::~Iterator() { |
| 30 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 31 Iter* it = reinterpret_cast<Iter*>(iter_); |
| 32 delete it; |
| 33 } |
| 34 |
| 35 bool CachingCertVerifier::Iterator::HasNext() const { |
| 36 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 37 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 38 return it->HasNext(); |
| 39 } |
| 40 |
| 41 void CachingCertVerifier::Iterator::Advance() { |
| 42 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 43 Iter* it = reinterpret_cast<Iter*>(iter_); |
| 44 it->Advance(); |
| 45 } |
| 46 |
| 47 const CertVerifier::RequestParams& CachingCertVerifier::Iterator::params() |
| 48 const { |
| 49 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 50 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 51 return it->key(); |
| 52 } |
| 53 |
| 54 int CachingCertVerifier::Iterator::error() const { |
| 55 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 56 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 57 return it->value().error; |
| 58 } |
| 59 |
| 60 const CertVerifyResult& CachingCertVerifier::Iterator::verify_result() const { |
| 61 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 62 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 63 return it->value().result; |
| 64 } |
| 65 |
| 66 base::Time CachingCertVerifier::Iterator::verification_time() const { |
| 67 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 68 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 69 return it->expiration().verification_time; |
| 70 } |
| 71 |
| 72 base::Time CachingCertVerifier::Iterator::expiration_time() const { |
| 73 using Iter = CachingCertVerifier::CertVerificationCache::Iterator; |
| 74 const Iter* it = reinterpret_cast<const Iter*>(iter_); |
| 75 return it->expiration().expiration_time; |
| 76 } |
| 77 |
| 23 CachingCertVerifier::CachingCertVerifier(std::unique_ptr<CertVerifier> verifier) | 78 CachingCertVerifier::CachingCertVerifier(std::unique_ptr<CertVerifier> verifier) |
| 24 : verifier_(std::move(verifier)), | 79 : verifier_(std::move(verifier)), |
| 25 trust_anchor_provider_(nullptr), | 80 trust_anchor_provider_(nullptr), |
| 26 cache_(kMaxCacheEntries), | 81 cache_(kMaxCacheEntries), |
| 27 requests_(0u), | 82 requests_(0u), |
| 28 cache_hits_(0u) { | 83 cache_hits_(0u) { |
| 29 CertDatabase::GetInstance()->AddObserver(this); | 84 CertDatabase::GetInstance()->AddObserver(this); |
| 30 } | 85 } |
| 31 | 86 |
| 32 CachingCertVerifier::~CachingCertVerifier() { | 87 CachingCertVerifier::~CachingCertVerifier() { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 AddResultToCache(new_params, start_time, *verify_result, result); | 134 AddResultToCache(new_params, start_time, *verify_result, result); |
| 80 } | 135 } |
| 81 | 136 |
| 82 return result; | 137 return result; |
| 83 } | 138 } |
| 84 | 139 |
| 85 bool CachingCertVerifier::SupportsOCSPStapling() { | 140 bool CachingCertVerifier::SupportsOCSPStapling() { |
| 86 return verifier_->SupportsOCSPStapling(); | 141 return verifier_->SupportsOCSPStapling(); |
| 87 } | 142 } |
| 88 | 143 |
| 144 bool CachingCertVerifier::AddEntry(const RequestParams& params, |
| 145 int error, |
| 146 const CertVerifyResult& verify_result, |
| 147 base::Time verification_time) { |
| 148 // If the cache is full, don't bother. |
| 149 if (cache_.size() == cache_.max_entries()) |
| 150 return false; |
| 151 |
| 152 // If there is an existing entry, don't bother updating it. |
| 153 const CertVerificationCache::value_type* entry = |
| 154 cache_.Get(params, CacheValidityPeriod(base::Time::Now())); |
| 155 if (entry) |
| 156 return false; |
| 157 |
| 158 // Otherwise, go and add it. |
| 159 AddResultToCache(params, verification_time, verify_result, error); |
| 160 return true; |
| 161 } |
| 162 |
| 89 CachingCertVerifier::CachedResult::CachedResult() : error(ERR_FAILED) {} | 163 CachingCertVerifier::CachedResult::CachedResult() : error(ERR_FAILED) {} |
| 90 | 164 |
| 91 CachingCertVerifier::CachedResult::~CachedResult() {} | 165 CachingCertVerifier::CachedResult::~CachedResult() {} |
| 92 | 166 |
| 93 CachingCertVerifier::CacheValidityPeriod::CacheValidityPeriod(base::Time now) | 167 CachingCertVerifier::CacheValidityPeriod::CacheValidityPeriod(base::Time now) |
| 94 : verification_time(now), expiration_time(now) {} | 168 : verification_time(now), expiration_time(now) {} |
| 95 | 169 |
| 96 CachingCertVerifier::CacheValidityPeriod::CacheValidityPeriod( | 170 CachingCertVerifier::CacheValidityPeriod::CacheValidityPeriod( |
| 97 base::Time now, | 171 base::Time now, |
| 98 base::Time expiration) | 172 base::Time expiration) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 | 261 |
| 188 void CachingCertVerifier::ClearCache() { | 262 void CachingCertVerifier::ClearCache() { |
| 189 cache_.Clear(); | 263 cache_.Clear(); |
| 190 } | 264 } |
| 191 | 265 |
| 192 size_t CachingCertVerifier::GetCacheSize() const { | 266 size_t CachingCertVerifier::GetCacheSize() const { |
| 193 return cache_.size(); | 267 return cache_.size(); |
| 194 } | 268 } |
| 195 | 269 |
| 196 } // namespace net | 270 } // namespace net |
| OLD | NEW |