Componentize renderer side of DNS prefetching.

chrome/browser/net/predictor.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 "chrome/browser/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <sstream>
@@ skipping 15 matching lines @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/preconnect.h"
 #include "chrome/browser/net/spdyproxy/proxy_advisor.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
+#include "components/dns_prefetch/common/prefetch_common.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/single_request_host_resolver.h"
@@ skipping 683 matching lines @@
     return;
   }
   initial_observer_->Append(url, this);
 }
 
 // This API is only used in the browser process.
 // It is called from an IPC message originating in the renderer.  It currently
 // includes both Page-Scan, and Link-Hover prefetching.
 // TODO(jar): Separate out link-hover prefetching, and page-scan results.
 void Predictor::DnsPrefetchList(const NameList& hostnames) {
+  if (hostnames.size() > dns_prefetch::kMaxDnsHostnamesPerRequest) {
+    LOG(DFATAL) << "Refusing to prefetch too many hostnames: "

[jar (doing other things), 2014/10/28 22:49:32]

nit: Please use DLOG.  No one will look at this... so there is no reason to
swell the binary.

It is also plausible that you should "fix" the data, by truncating any overlong
list, rather than aborting all progress.

[gunsch, 2014/10/29 23:58:29]

Covered by removing this and doing validation with a custom IpcParamTraits.

+                << hostnames.size();
+    return;
+  }
+
   // TODO(jar): Push GURL transport further back into renderer, but this will
   // require a Webkit change in the observer :-/.
   UrlList urls;
   for (NameList::const_iterator it = hostnames.begin();
        it < hostnames.end();
        ++it) {
+    if (it->length() > dns_prefetch::kMaxDnsHostnameLength) {
+      LOG(DFATAL) << "Refusing to prefetch hostname with length: "

[jar (doing other things), 2014/10/28 22:49:32]

nit: DLOG

[gunsch, 2014/10/29 23:58:29]

ditto

+                  << it->length();
+      continue;
+    }
     urls.push_back(GURL("http://" + *it + ":80"));
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DnsPrefetchMotivatedList(urls, UrlInfo::PAGE_SCAN_MOTIVATED);
 }
 
 void Predictor::DnsPrefetchMotivatedList(
     const UrlList& urls,
     UrlInfo::ResolutionMotivation motivation) {
@@ skipping 587 matching lines @@
 }
 
 void SimplePredictor::ShutdownOnUIThread() {
   SetShutdown(true);
 }
 
 bool SimplePredictor::CanPrefetchAndPrerender() const { return true; }
 bool SimplePredictor::CanPreresolveAndPreconnect() const { return true; }
 
 }  // namespace chrome_browser_net