Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/certificate_transparency/tree_state_tracker.h" | 5 #include "components/certificate_transparency/tree_state_tracker.h" |
| 6 | 6 |
| 7 #include "base/feature_list.h" | |
| 8 #include "base/memory/ptr_util.h" | |
| 9 #include "components/certificate_transparency/log_dns_client.h" | |
| 7 #include "components/certificate_transparency/single_tree_tracker.h" | 10 #include "components/certificate_transparency/single_tree_tracker.h" |
| 11 #include "net/base/network_change_notifier.h" | |
| 8 #include "net/cert/ct_log_verifier.h" | 12 #include "net/cert/ct_log_verifier.h" |
| 9 #include "net/cert/signed_certificate_timestamp.h" | 13 #include "net/cert/signed_certificate_timestamp.h" |
| 10 #include "net/cert/signed_tree_head.h" | 14 #include "net/cert/signed_tree_head.h" |
| 11 #include "net/cert/x509_certificate.h" | 15 #include "net/cert/x509_certificate.h" |
| 16 #include "net/dns/dns_client.h" | |
| 17 #include "net/dns/dns_config_service.h" | |
| 18 #include "net/log/net_log.h" | |
| 12 | 19 |
| 13 using net::X509Certificate; | 20 using net::X509Certificate; |
| 14 using net::CTLogVerifier; | 21 using net::CTLogVerifier; |
| 15 using net::ct::SignedCertificateTimestamp; | 22 using net::ct::SignedCertificateTimestamp; |
| 16 using net::ct::SignedTreeHead; | 23 using net::ct::SignedTreeHead; |
| 17 | 24 |
| 25 namespace { | |
| 26 const size_t kMaxConcurrentDnsQueries = 1; | |
| 27 } | |
| 28 | |
| 18 namespace certificate_transparency { | 29 namespace certificate_transparency { |
| 19 | 30 |
| 31 // Enables or disables auditing Certificate Transparency logs over DNS. | |
| 32 const base::Feature kCTLogAuditing = {"CertificateTransparencyLogAuditing", | |
| 33 base::FEATURE_DISABLED_BY_DEFAULT}; | |
| 34 | |
| 20 TreeStateTracker::TreeStateTracker( | 35 TreeStateTracker::TreeStateTracker( |
| 21 std::vector<scoped_refptr<const CTLogVerifier>> ct_logs) { | 36 std::vector<scoped_refptr<const CTLogVerifier>> ct_logs) { |
| 22 for (const auto& log : ct_logs) | 37 if (!base::FeatureList::IsEnabled(kCTLogAuditing)) |
| 23 tree_trackers_[log->key_id()].reset(new SingleTreeTracker(log)); | 38 return; |
| 39 | |
| 40 net::NetLogWithSource net_log; | |
|
Ryan Sleevi
2017/01/10 03:15:54
I'm a little squicky about this and whether it's O
eroman
2017/01/10 21:23:10
This is technically a supported pattern, in that i
Eran Messeri
2017/01/17 11:37:57
I can fix it the following way:
* Pass in a NetLog
eroman
2017/01/20 00:03:49
That works for me.
Stick a TODO by this line and y
Eran Messeri
2017/01/20 09:49:05
Done.
| |
| 41 std::unique_ptr<net::DnsClient> dns_client = | |
| 42 net::DnsClient::CreateClient(net_log.net_log()); | |
| 43 dns_client_ = base::MakeUnique<LogDnsClient>(std::move(dns_client), net_log, | |
| 44 kMaxConcurrentDnsQueries); | |
| 45 | |
| 46 for (const auto& log : ct_logs) { | |
| 47 tree_trackers_[log->key_id()].reset( | |
| 48 new SingleTreeTracker(log, dns_client_.get())); | |
| 49 } | |
| 24 } | 50 } |
| 25 | 51 |
| 26 TreeStateTracker::~TreeStateTracker() {} | 52 TreeStateTracker::~TreeStateTracker() {} |
| 27 | 53 |
| 28 void TreeStateTracker::OnSCTVerified(X509Certificate* cert, | 54 void TreeStateTracker::OnSCTVerified(X509Certificate* cert, |
| 29 const SignedCertificateTimestamp* sct) { | 55 const SignedCertificateTimestamp* sct) { |
| 30 auto it = tree_trackers_.find(sct->log_id); | 56 auto it = tree_trackers_.find(sct->log_id); |
| 31 // Ignore if the SCT is from an unknown log. | 57 // Ignore if the SCT is from an unknown log. |
| 32 if (it == tree_trackers_.end()) | 58 if (it == tree_trackers_.end()) |
| 33 return; | 59 return; |
| 34 | 60 |
| 35 it->second->OnSCTVerified(cert, sct); | 61 it->second->OnSCTVerified(cert, sct); |
| 36 } | 62 } |
| 37 | 63 |
| 38 void TreeStateTracker::NewSTHObserved(const SignedTreeHead& sth) { | 64 void TreeStateTracker::NewSTHObserved(const SignedTreeHead& sth) { |
| 39 auto it = tree_trackers_.find(sth.log_id); | 65 auto it = tree_trackers_.find(sth.log_id); |
| 40 // Is the STH from a known log? Since STHs can be provided from external | 66 // Is the STH from a known log? Since STHs can be provided from external |
| 41 // sources for logs not yet recognized by this client, return, rather than | 67 // sources for logs not yet recognized by this client, return, rather than |
| 42 // DCHECK. | 68 // DCHECK. |
| 43 if (it == tree_trackers_.end()) | 69 if (it == tree_trackers_.end()) |
| 44 return; | 70 return; |
| 45 | 71 |
| 46 it->second->NewSTHObserved(sth); | 72 it->second->NewSTHObserved(sth); |
| 47 } | 73 } |
| 48 | 74 |
| 49 } // namespace certificate_transparency | 75 } // namespace certificate_transparency |
| OLD | NEW |