Always treat .localhost as loopback

net/dns/dns_transaction.cc

 // 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.
 
 #include "net/dns/dns_transaction.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "base/strings/string_piece.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "net/base/completion_callback.h"
 #include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
+#include "net/base/net_util.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_session.h"
 #include "net/socket/stream_socket.h"
 #include "net/udp/datagram_client_socket.h"
 
 namespace net {
 
 namespace {
@@ skipping 568 matching lines @@
     AttemptResult(int rv, const DnsAttempt* attempt)
         : rv(rv), attempt(attempt) {}
 
     int rv;
     const DnsAttempt* attempt;
   };
 
   // Prepares |qnames_| according to the DnsConfig.
   int PrepareSearch() {
     const DnsConfig& config = session_->config();
+    // Redirect .localhost queries to localhost to make sure that they are

[Deprecated (see juliatuttle), 2015/02/24 16:39:23]

Nit: "to localhost.", since you're including the trailing dot.

[estark, 2015/02/26 07:58:53]

fixed in the place where this comment has been relocated to

+    // never sent out on the network, per RFC 6761.
+    const std::string hostname =
+        (IsLocalhostTLD(hostname_) ? "localhost." : hostname_);
 
     std::string labeled_hostname;
-    if (!DNSDomainFromDot(hostname_, &labeled_hostname))
+    if (!DNSDomainFromDot(hostname, &labeled_hostname))
       return ERR_INVALID_ARGUMENT;
 
-    if (hostname_[hostname_.size() - 1] == '.') {
+    if (hostname[hostname.size() - 1] == '.') {
       // It's a fully-qualified name, no suffix search.
       qnames_.push_back(labeled_hostname);
       return OK;
     }
 
     int ndots = CountLabels(labeled_hostname) - 1;
 
     if (ndots > 0 && !config.append_to_multi_label_name) {
       qnames_.push_back(labeled_hostname);
       return OK;
     }
 
     // Set true when |labeled_hostname| is put on the list.
     bool had_hostname = false;
 
     if (ndots >= config.ndots) {
       qnames_.push_back(labeled_hostname);
       had_hostname = true;
     }
 
     std::string qname;
     for (size_t i = 0; i < config.search.size(); ++i) {
       // Ignore invalid (too long) combinations.
-      if (!DNSDomainFromDot(hostname_ + "." + config.search[i], &qname))
+      if (!DNSDomainFromDot(hostname + "." + config.search[i], &qname))
         continue;
       if (qname.size() == labeled_hostname.size()) {
         if (had_hostname)
           continue;
         had_hostname = true;
       }
       qnames_.push_back(qname);
     }
 
     if (ndots > 0 && !had_hostname)
@@ skipping 323 matching lines @@
 }  // namespace
 
 // static
 scoped_ptr<DnsTransactionFactory> DnsTransactionFactory::CreateFactory(
     DnsSession* session) {
   return scoped_ptr<DnsTransactionFactory>(
       new DnsTransactionFactoryImpl(session));
 }
 
 }  // namespace net