Send malware reports when a user opts-in from the safe browsing interstitial ...

chrome/browser/safe_browsing/malware_report.cc

Index: chrome/browser/safe_browsing/malware_report.cc
===================================================================
--- chrome/browser/safe_browsing/malware_report.cc	(revision 0)
+++ chrome/browser/safe_browsing/malware_report.cc	(revision 0)
@@ -0,0 +1,101 @@
+// Copyright (c) 2010 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 SafeBrowsingMalwareReport class.
+
+#include "chrome/browser/safe_browsing/malware_report.h"
+
+#include "chrome/browser/browser_thread.h"
+#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/safe_browsing/report.pb.h"
+
+// Create a SafeBrowsingMalwareReport for the given tab.
+// Runs in the UI thread.
+SafeBrowsingMalwareReport::SafeBrowsingMalwareReport(
+    TabContents* tab_contents,
+    const SafeBrowsingService::UnsafeResource resource)
+    : tab_contents_(tab_contents),
+      resource_(resource) {
+  StartCollection();
+}
+
+SafeBrowsingMalwareReport::~SafeBrowsingMalwareReport() {}
+
+bool SafeBrowsingMalwareReport::IsPublicUrl(const GURL& url) const {
+  return url.SchemeIs("http");  // TODO(panayiotis): also skip internal urls.
+}
+
+void SafeBrowsingMalwareReport::AddNode(
+    const std::string& url,
+    const std::string& parent) {
+  if (!IsPublicUrl(GURL(url)))
+    return;
+  linked_ptr<safe_browsing::ClientMalwareReportRequest::Resource> resource(
+      new safe_browsing::ClientMalwareReportRequest::Resource());
+  resource->set_url(url);
+  if (!parent.empty() && IsPublicUrl(GURL(parent)))
+    resource->set_parent(parent);
+  urls_[url] = resource;

[Scott Hess - ex-Googler, 2010/11/23 01:59:39]

Hmm, I'm not entirely clear that this should be linked_ptr versus putting
STLDeleteContainerPairSecondPointers() in the destructor.  Though I see that
people are using linked_ptr in various places these days.

Actually ... AFAICT urls_ only exists so that StartCollection() can call
AddNode().  Is the intention, here, that the map is used in case of duplicates? 
Otherwise, why not just have AddNode() live in an anonymous namespace and accept
report_ as a parameter and add items to it directly?  Then you don't need to
manage two structures at all.

[panayiotis, 2010/11/24 22:40:15]

The intention is to be able to (a) eliminate duplicates and (b) find a node fast
so we can modify eg its parent. The protocol buffer's vector-like structure is
not good for that, hence the intermediate map.

In the future, we'll have the renderer send us resource info, possibly with
duplicates.

As for the linked_ptr, I couldn't find any discussion suggesting not to use them
in chromium-dev -- They are supposedly really good for STL containers.

I can switch to STLDelete ... I'd have to manually delete entries that are
duplicate, that's the only reason I'd prefer the linked_ptr.


On 2010/11/23 01:59:39, shess wrote:

+}
+
+void SafeBrowsingMalwareReport::StartCollection() {
+  DVLOG(1) << "Starting to compute a new malware report.";
+  report_.reset(new safe_browsing::ClientMalwareReportRequest());
+
+  if (IsPublicUrl(resource_.url)) {
+    report_->set_malware_url(resource_.url.spec());
+  }
+
+  GURL page_url = tab_contents_->GetURL();
+  if (IsPublicUrl(page_url)) {
+    report_->set_page_url(page_url.spec());
+  }
+
+  GURL referrer_url;
+  NavigationEntry* nav_entry = tab_contents_->controller().GetActiveEntry();
+  if (nav_entry) {
+    referrer_url = nav_entry->referrer();
+    if (IsPublicUrl(referrer_url)) {
+      report_->set_referrer_url(referrer_url.spec());
+    }
+  }
+
+  // Add the nodes, starting from the page url.
+  AddNode(page_url.spec(), "");
+
+  // Add the resource_url and its original url, if non-empty and different.
+  if (!resource_.original_url.spec().empty() &&
+      resource_.url != resource_.original_url) {
+    // Add original_url, as the parent of resource_url.
+    AddNode(resource_.original_url.spec(), "");
+    AddNode(resource_.url.spec(), resource_.original_url.spec());
+  } else {
+    AddNode(resource_.url.spec(), "");
+  }
+
+  // Add the referrer url.
+  if (nav_entry && !referrer_url.spec().empty()) {
+    AddNode(referrer_url.spec(), "");
+  }
+
+  // Add all the urls in our |urls_| map to the |report_| protobuf.
+  for (ResourceMap::const_iterator it = urls_.begin();
+       it != urls_.end(); it++) {
+    safe_browsing::ClientMalwareReportRequest::Resource* pb_resource =
+        report_->add_nodes();
+    pb_resource->CopyFrom(*(it->second));
+  }
+}
+
+// Called from the SB Service on the IO thread.
+const std::string* SafeBrowsingMalwareReport::GetSerializedReport() {
+  scoped_ptr<std::string> request_data(new std::string());
+  if (!report_->SerializeToString(request_data.get())) {
+    DLOG(ERROR) << "Unable to serialize the malware report.";
+  }
+
+  return request_data.release();
+}
Property changes on: chrome/browser/safe_browsing/malware_report.cc
___________________________________________________________________
Added: svn:eol-style
   + LF