LogDnsClient now rejects responses unless they contain exactly one TXT RDATA string

components/certificate_transparency/mock_log_dns_traffic.h

 // Copyright 2016 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 COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_
 #define COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 76 matching lines @@
   void ExpectRequestAndErrorResponse(base::StringPiece qname, uint8_t rcode);
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will trigger a socket error of type |net_error|.
   // |net_error| can be any net:Error value.
   void ExpectRequestAndSocketError(base::StringPiece qname, int net_error);
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will timeout.
   // This will reduce the DNS timeout to minimize test duration.
   void ExpectRequestAndTimeout(base::StringPiece qname);
   // Expect a CT DNS request for the domain |qname|.
+  // Such a request will receive a DNS TXT response containing |txt_strings|.
+  void ExpectRequestAndResponse(
+    base::StringPiece qname,
+    const std::vector<base::StringPiece>& txt_strings);
+  // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS response containing |leaf_index|.
   // A description of such a request and response can be seen here:
   // https://github.com/google/certificate-transparency-rfcs/blob/c8844de6bd0b5d3d16bac79865e6edef533d760b/dns/draft-ct-over-dns.md#hash-query-hashquery
   void ExpectLeafIndexRequestAndResponse(base::StringPiece qname,
-                                         base::StringPiece leaf_index);
+                                         uint64_t leaf_index);
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS response containing the inclusion proof
   // nodes between |audit_path_start| and |audit_path_end|.
   // A description of such a request and response can be seen here:
   // https://github.com/google/certificate-transparency-rfcs/blob/c8844de6bd0b5d3d16bac79865e6edef533d760b/dns/draft-ct-over-dns.md#tree-query-treequery
   void ExpectAuditProofRequestAndResponse(
       base::StringPiece qname,
       std::vector<std::string>::const_iterator audit_path_start,
       std::vector<std::string>::const_iterator audit_path_end);
 
@@ skipping 12 matching lines @@
   // Creates a DNS client that uses mock sockets.
   // It is this DNS client that the expectations will be tested against.
   std::unique_ptr<net::DnsClient> CreateDnsClient();
 
   // Sets whether mock reads should complete synchronously or asynchronously.
   void SetSocketReadMode(net::IoMode read_mode) {
     socket_read_mode_ = read_mode;
   }
 
  private:
-  // Expect A CT DNS request for the domain |qname|.
-  // Such a request will receive a DNS response containing |answer|.
-  void ExpectRequestAndResponse(base::StringPiece qname,
-                                base::StringPiece answer);
-
   // Constructs MockSocketData from |args| and adds it to |socket_factory_|.
   template <typename... Args>
   void EmplaceMockSocketData(Args&&... args);
 
   // Sets the timeout used for DNS queries.
   // Requires that net::NetworkChangeNotifier is initialized first.
   // The new timeout is propogated to NetworkChangeNotifier::DNSObservers
   // asynchronously.
   void SetDnsTimeout(const base::TimeDelta& timeout);
 
   // One MockSocketData for each socket that is created. This corresponds to one
   // for each DNS request sent.
   std::vector<std::unique_ptr<internal::MockSocketData>> mock_socket_data_;
   // Provides as many mock sockets as there are entries in |mock_socket_data_|.
   net::MockClientSocketFactory socket_factory_;
   // Controls whether mock socket reads are asynchronous.
   net::IoMode socket_read_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MockLogDnsTraffic);
 };
 
 }  // namespace certificate_transparency
 
 #endif  // COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_