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

Side by Side Diff: net/cert/caching_cert_verifier_unittest.cc

Issue 2070223002: Remove CertTrustAnchorProvider from net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Namespace Created 4 years, 6 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
« no previous file with comments | « net/cert/caching_cert_verifier.cc ('k') | net/cert/cert_trust_anchor_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 7 #include <memory>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 #include "net/base/test_completion_callback.h" 13 #include "net/base/test_completion_callback.h"
14 #include "net/base/test_data_directory.h" 14 #include "net/base/test_data_directory.h"
15 #include "net/cert/cert_trust_anchor_provider.h"
16 #include "net/cert/cert_verifier.h" 15 #include "net/cert/cert_verifier.h"
17 #include "net/cert/cert_verify_result.h" 16 #include "net/cert/cert_verify_result.h"
18 #include "net/cert/mock_cert_verifier.h" 17 #include "net/cert/mock_cert_verifier.h"
19 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
20 #include "net/log/net_log.h" 19 #include "net/log/net_log.h"
21 #include "net/test/cert_test_util.h" 20 #include "net/test/cert_test_util.h"
22 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
23 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
24 23
25 using testing::_; 24 using testing::_;
26 using testing::Mock; 25 using testing::Mock;
27 using testing::Return; 26 using testing::Return;
28 using testing::ReturnRef; 27 using testing::ReturnRef;
29 28
30 namespace net { 29 namespace net {
31 30
32 namespace { 31 namespace {
33 32
34 class MockCertTrustAnchorProvider : public CertTrustAnchorProvider {
35 public:
36 MockCertTrustAnchorProvider() {}
37 virtual ~MockCertTrustAnchorProvider() {}
38
39 MOCK_METHOD0(GetAdditionalTrustAnchors, const CertificateList&());
40 };
41
42 class MockCacheVisitor : public CachingCertVerifier::CacheVisitor { 33 class MockCacheVisitor : public CachingCertVerifier::CacheVisitor {
43 public: 34 public:
44 MockCacheVisitor() {} 35 MockCacheVisitor() {}
45 ~MockCacheVisitor() override {} 36 ~MockCacheVisitor() override {}
46 37
47 MOCK_METHOD5(VisitEntry, 38 MOCK_METHOD5(VisitEntry,
48 bool(const CachingCertVerifier::RequestParams& params, 39 bool(const CachingCertVerifier::RequestParams& params,
49 int error, 40 int error,
50 const CertVerifyResult& result, 41 const CertVerifyResult& result,
51 base::Time verification_time, 42 base::Time verification_time,
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 error = callback.GetResult(verifier_.Verify( 262 error = callback.GetResult(verifier_.Verify(
272 CertVerifier::RequestParams(cert_chain2, "www.example.com", 0, 263 CertVerifier::RequestParams(cert_chain2, "www.example.com", 0,
273 std::string(), CertificateList()), 264 std::string(), CertificateList()),
274 nullptr, &verify_result, callback.callback(), &request, BoundNetLog())); 265 nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
275 ASSERT_TRUE(IsCertificateError(error)); 266 ASSERT_TRUE(IsCertificateError(error));
276 ASSERT_EQ(2u, verifier_.requests()); 267 ASSERT_EQ(2u, verifier_.requests());
277 ASSERT_EQ(0u, verifier_.cache_hits()); 268 ASSERT_EQ(0u, verifier_.cache_hits());
278 ASSERT_EQ(2u, verifier_.GetCacheSize()); 269 ASSERT_EQ(2u, verifier_.GetCacheSize());
279 } 270 }
280 271
281 TEST_F(CachingCertVerifierTest, CertTrustAnchorProvider) {
282 MockCertTrustAnchorProvider trust_provider;
283 verifier_.SetCertTrustAnchorProvider(&trust_provider);
284
285 scoped_refptr<X509Certificate> test_cert(
286 ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
287 ASSERT_TRUE(test_cert.get());
288
289 const CertificateList empty_cert_list;
290 CertificateList cert_list;
291 cert_list.push_back(test_cert);
292
293 // Check that Verify() asks the |trust_provider| for the current list of
294 // additional trust anchors.
295 int error;
296 CertVerifyResult verify_result;
297 TestCompletionCallback callback;
298 std::unique_ptr<CertVerifier::Request> request;
299 EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
300 .WillOnce(ReturnRef(empty_cert_list));
301 error = callback.GetResult(verifier_.Verify(
302 CertVerifier::RequestParams(test_cert, "www.example.com", 0,
303 std::string(), CertificateList()),
304 nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
305 Mock::VerifyAndClearExpectations(&trust_provider);
306 EXPECT_TRUE(IsCertificateError(error));
307 ASSERT_EQ(1u, verifier_.requests());
308 ASSERT_EQ(0u, verifier_.cache_hits());
309
310 // The next Verify() uses the cached result.
311 EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
312 .WillOnce(ReturnRef(empty_cert_list));
313 error = callback.GetResult(verifier_.Verify(
314 CertVerifier::RequestParams(test_cert, "www.example.com", 0,
315 std::string(), CertificateList()),
316 nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
317 Mock::VerifyAndClearExpectations(&trust_provider);
318 EXPECT_TRUE(IsCertificateError(error));
319 ASSERT_EQ(2u, verifier_.requests());
320 ASSERT_EQ(1u, verifier_.cache_hits());
321
322 // Another Verify() for the same certificate but with a different list of
323 // trust anchors will not reuse the cache.
324 EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
325 .WillOnce(ReturnRef(cert_list));
326 error = callback.GetResult(verifier_.Verify(
327 CertVerifier::RequestParams(test_cert, "www.example.com", 0,
328 std::string(), CertificateList()),
329 nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
330 Mock::VerifyAndClearExpectations(&trust_provider);
331 EXPECT_TRUE(IsCertificateError(error));
332 ASSERT_EQ(3u, verifier_.requests());
333 ASSERT_EQ(1u, verifier_.cache_hits());
334 }
335
336 } // namespace net 272 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/caching_cert_verifier.cc ('k') | net/cert/cert_trust_anchor_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698