SafeBrowsing Opt-in Malware Reports: Collect remote ip:port pairs for requests that were not fetc...

chrome/browser/safe_browsing/malware_details_cache.cc

 // Copyright (c) 2011 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.
 //
 // Implementation of the MalwareDetails class.
 
 #include "chrome/browser/safe_browsing/malware_details.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/safe_browsing/malware_details_cache.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/report.pb.h"
 #include "content/browser/browser_thread.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using safe_browsing::ClientMalwareReportRequest;
 
 // Only send small files for now, a better strategy would use the size
 // of the whole report and the user's bandwidth.
 static const uint32 kMaxBodySizeBytes = 1024;
@@ skipping 130 matching lines @@
     ClientMalwareReportRequest::HTTPHeader* pb_header =
         pb_response->add_headers();
     pb_header->set_name(name);
     // Strip any Set-Cookie headers.
     if (LowerCaseEqualsASCII(name, "set-cookie")) {
       pb_header->set_value("");
     } else {
       pb_header->set_value(value);
     }
   }
+
+  net::HostPortPair socket_address = source->socket_address();

[mattm, 2011/05/10 21:26:30]

Could go in the if block, or just do it inline in the function call?

[panayiotis, 2011/05/10 21:47:36]

Done.

+  if (!source->was_fetched_via_proxy()) {
+    pb_response->set_remote_ip(socket_address.ToString());

[mattm, 2011/05/10 21:26:30]

Can the test be updated to check this?

[panayiotis, 2011/05/10 21:47:36]

Done.

+  }
 }
 
 void MalwareDetailsCacheCollector::ReadData(
     ClientMalwareReportRequest::Resource* pb_resource,
     const std::string& data) {
   DVLOG(1) << "ReadData";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ClientMalwareReportRequest::HTTPResponse* pb_response =
       pb_resource->mutable_response();
   if (data.size() <= kMaxBodySizeBytes) {  // Only send small bodies for now.
@@ skipping 17 matching lines @@
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &MalwareDetailsCacheCollector::OpenEntry));
 }
 
 void MalwareDetailsCacheCollector::AllDone(bool success) {
   DVLOG(1) << "AllDone";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   *result_ = success;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
 }