Run pre-classification checks in the browser before starting client-side phishing detection.

chrome/browser/safe_browsing/client_side_detection_service.cc

Index: chrome/browser/safe_browsing/client_side_detection_service.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index f655e2afe8ca3485558a40a832c0aaba6f4fa351..6367882f0ad83e95ea4696a89a61346e33fe1278 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -14,10 +14,16 @@
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/safe_browsing/csd.pb.h"
+#include "chrome/browser/tab_contents/provisional_load_details.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
+#include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
@@ -34,6 +40,69 @@ struct ClientSideDetectionService::ClientReportInfo {
   GURL phishing_url;
 };
 
+// ShouldClassifyUrlRequest tracks the pre-classification checks for a
+// toplevel URL that has started loading into a renderer.  When these
+// checks are complete, the renderer is notified if it should run
+// client-side phishing classification, then the ShouldClassifyUrlRequest
+// deletes itself.
+class ClientSideDetectionService::ShouldClassifyUrlRequest
+    : public NotificationObserver {
+ public:
+  ShouldClassifyUrlRequest(const GURL& url, TabContents* tab_contents)
+      : url_(url),
+        tab_contents_(tab_contents),
+        ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    registrar_.Add(this,
+                   NotificationType::TAB_CONTENTS_DESTROYED,
+                   Source<TabContents>(tab_contents));
+  }
+
+  virtual ~ShouldClassifyUrlRequest() {}

[noelutz, 2011/01/26 01:31:21]

make the destructor private to make sure we delete that object?

[Brian Ryner, 2011/02/01 21:45:45]

Done.

+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    switch (type.value) {
+      case NotificationType::TAB_CONTENTS_DESTROYED:
+        Cancel();
+        break;
+      default:
+        NOTREACHED();
+    };
+  }
+
+  void Start() {
+    // TODO(bryner): add pre-classification checks here.
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

[noelutz, 2011/01/26 01:31:21]

Maybe comment why you're not simply calling Finish() since you are already on
the right thread?

[Brian Ryner, 2011/02/01 21:45:45]

Done.

+    BrowserThread::PostTask(BrowserThread::UI,
+                            FROM_HERE,
+                            method_factory_.NewRunnableMethod(
+                                &ShouldClassifyUrlRequest::Finish));
+  }
+
+ private:
+  void Cancel() {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    tab_contents_ = NULL;

[noelutz, 2011/01/26 01:31:21]

delete this or call Finish()?

[Brian Ryner, 2011/02/01 21:45:45]

Originally I was thinking we might not be able to cancel the request
synchronously, for example if we had already started an operation on another
thread.  But, that may not actually be a problem, and I agree it's clearer for
now if we just do this synchronously.

+  }
+
+  void Finish() {
+    if (tab_contents_) {
+      RenderViewHost* rvh = tab_contents_->render_view_host();
+      rvh->Send(new ViewMsg_StartPhishingDetection(rvh->routing_id(), url_));
+    }
+    delete this;
+  }
+
+  GURL url_;
+  TabContents* tab_contents_;
+  NotificationRegistrar registrar_;
+  ScopedRunnableMethodFactory<ShouldClassifyUrlRequest> method_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShouldClassifyUrlRequest);
+};
+
 ClientSideDetectionService::ClientSideDetectionService(
     const FilePath& model_path,
     URLRequestContextGetter* request_context_getter)
@@ -43,6 +112,12 @@ ClientSideDetectionService::ClientSideDetectionService(
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)),
       request_context_getter_(request_context_getter) {
+  // Register to find out when pages begin loading into a renderer.
+  // When this happens, we'll do our pre-classificaton checks for
+  // client side phishing detection.
+  registrar_.Add(this,
+                 NotificationType::FRAME_PROVISIONAL_LOAD_COMMITTED,
+                 NotificationService::AllSources());
 }
 
 ClientSideDetectionService::~ClientSideDetectionService() {
@@ -114,6 +189,34 @@ void ClientSideDetectionService::OnURLFetchComplete(
   }
 }
 
+void ClientSideDetectionService::Observe(NotificationType type,
+                                         const NotificationSource& source,
+                                         const NotificationDetails& details) {
+  switch (type.value) {
+    case NotificationType::FRAME_PROVISIONAL_LOAD_COMMITTED:
+      {

[lzheng, 2011/01/27 18:31:27]

{ and the later } should not be needed.

[Brian Ryner, 2011/02/01 21:45:45]

I need an enclosing scope since I'm defining variables inside of the "case". 
But, my formatting didn't match the style guide, so I've fixed that.

+        // Check whether the load should trigger a phishing classification.
+        ProvisionalLoadDetails* load_details =
+            Details<ProvisionalLoadDetails>(details).ptr();
+
+        if (load_details->main_frame() &&
+            (load_details->transition_type() & PageTransition::FORWARD_BACK) !=
+             PageTransition::FORWARD_BACK &&
+            !load_details->in_page_navigation()) {
+          NavigationController* controller =
+              Source<NavigationController>(source).ptr();
+          ShouldClassifyUrlRequest* request =
+              new ShouldClassifyUrlRequest(load_details->url(),
+                                           controller->tab_contents());
+          request->Start();  // the request will delete itself on completion
+        }
+        break;
+      }
+    default:
+      NOTREACHED();
+  };
+}
+
 void ClientSideDetectionService::SetModelStatus(ModelStatus status) {
   DCHECK_NE(READY_STATUS, model_status_);
   model_status_ = status;