fetch malware data with the url classifier. b=389501, r=tony

browser/app/profile/firefox.js

@@ -497,6 +497,9 @@ pref("browser.feeds.handler", "ask");
 pref("browser.safebrowsing.enabled", true);
 pref("browser.safebrowsing.remoteLookups", false);
 
+// Prevent loading of pages identified as malware
+pref("browser.safebrowsing.malware.enabled", true);
+
 // Non-enhanced mode (local url lists) URL list to check for updates
 pref("browser.safebrowsing.provider.0.updateURL", "http://sb.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.0");
 

browser/components/safebrowsing/content/application.js

@@ -84,6 +84,7 @@ function PROT_Application() {
   // expose some classes
   this.PROT_Controller = PROT_Controller;
   this.PROT_PhishingWarden = PROT_PhishingWarden;
+  this.PROT_MalwareWarden = PROT_MalwareWarden;
 
   // Load data provider pref values
   gDataProvider = new PROT_DataProvider();

browser/components/safebrowsing/content/malware-warden.js

@@ -0,0 +1,129 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Google Safe Browsing.
+#
+# The Initial Developer of the Original Code is Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Dave Camp <dcamp@mozilla.com>
+#   Fritz Schneider <fritz@google.com> (original phishing-warden.js author)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+// This warden manages updates to the malware list
+
+const kMalwareWardenEnabledPref = "browser.safebrowsing.malware.enabled";
+
+function PROT_MalwareWarden() {
+  PROT_ListWarden.call(this);
+
+  this.debugZone = "malwarewarden";
+
+  // Use this to query preferences
+  this.prefs_ = new G_Preferences();
+
+  // Global preference to enable the malware warden
+  this.malwareWardenEnabled_ =
+    this.prefs_.getPref(kMalwareWardenEnabledPref, null);
+
+  // Get notifications when the malware warden enabled pref changes
+  var malwareWardenPrefObserver =
+    BindToObject(this.onMalwareWardenEnabledPrefChanged, this);
+  this.prefs_.addObserver(kMalwareWardenEnabledPref, malwareWardenPrefObserver);
+
+  // Add a test chunk to the database
+  var testData = "mozilla.com/firefox/its-an-attack.html";
+
+  var testUpdate =
+    "n:1000\ni:test-malware-simple\nad:1\n" +
+    "a:1:" + testData.length + "\n" +
+    testData +
+    "\n";
+
+  var dbService_ = Cc["@mozilla.org/url-classifier/dbservice;1"]
+                   .getService(Ci.nsIUrlClassifierDBService);
+
+  dbService_.update(testUpdate);
+  dbService_.finish(function(result) {}, function(error) {});
+
+  G_Debug(this, "malwareWarden initialized");
+}
+
+PROT_MalwareWarden.inherits(PROT_ListWarden);
+
+/**
+ * Cleanup on shutdown.
+ */
+PROT_MalwareWarden.prototype.shutdown = function() {
+  this.prefs_.removeAllObservers();
+
+  this.listManager_ = null;
+}
+
+/**
+ * When a preference changes, we might have to start or stop asking for
+ * updates.
+ */
+PROT_MalwareWarden.prototype.maybeToggleUpdateChecking = function() {
+  var malwareWardenEnabled = this.prefs_.getPref(kMalwareWardenEnabledPref,
+                                                 null);
+
+  G_Debug(this, "Maybe toggling update checking. " +
+          "Warden enabled? " + malwareWardenEnabled);
+
+  // Do nothing unless thre pref is set
+  if (malwareWardenEnabled === null)
+    return;
+
+  // We update and save to disk all tables if we don't have remote checking
+  // enabled.
+  if (malwareWardenEnabled === true) {
+    this.enableBlacklistTableUpdates();
+  } else {
+    // Anti-malware is off, disable table updates
+    this.disableBlacklistTableUpdates();
+  }
+}
+
+/**
+ * Deal with a user changing the pref that says whether we should 
+ * enable the malware warden.
+ *
+ * @param prefName Name of the pref holding the value indicating whether
+ *                 we should enable the malware warden
+ */
+PROT_MalwareWarden.prototype.onMalwareWardenEnabledPrefChanged = function(
+                                                                    prefName) {
+  // Just to be safe, ignore changes to sub prefs.
+  if (prefName != kMalwareWardenEnabledPref)
+    return;
+
+  this.malwareWardenEnabled_ =
+    this.prefs_.getPref(prefName, this.malwareWardenEnabled_);
+  this.maybeToggleUpdateChecking();
+}

browser/components/safebrowsing/content/sb-loader.js

@@ -69,6 +69,14 @@ var safebrowsing = {
     var appContext = Cc["@mozilla.org/safebrowsing/application;1"]
                      .getService().wrappedJSObject;
 
+    var malwareWarden = new appContext.PROT_MalwareWarden();
+    safebrowsing.malwareWarden = malwareWarden;
+
+    // Register tables
+    malwareWarden.registerBlackTable("goog-malware-sha128");
+
+    malwareWarden.maybeToggleUpdateChecking();
+
     // Each new browser window needs its own controller. 
 
     safebrowsing.progressListener.QueryInterface(Ci.nsIWebProgressListener);
@@ -127,6 +135,9 @@ var safebrowsing = {
     if (safebrowsing.phishWarden) {
       safebrowsing.phishWarden.shutdown();
     }
+    if (safebrowsing.malwareWarden) {
+      safebrowsing.malwareWarden.shutdown();
+    }
     
     window.removeEventListener("unload", safebrowsing.shutdown, false);
   },

browser/components/safebrowsing/src/nsSafebrowsingApplication.js

@@ -18,6 +18,7 @@ Function.prototype.inherits = function(parentCtor) {
 #include ../content/list-warden.js
 #include ../content/phishing-afterload-displayer.js
 #include ../content/phishing-warden.js
+#include ../content/malware-warden.js
 #include ../content/reporter.js
 #include ../content/tr-fetcher.js
 

toolkit/components/url-classifier/content/listmanager.js

@@ -357,7 +357,8 @@ PROT_ListManager.prototype.checkForUpdates = function() {
 PROT_ListManager.prototype.makeUpdateRequest_ = function(tableData) {
   var tableNames = {};
   for (var tableName in this.tablesData) {
-    tableNames[tableName] = true;
+    if (this.tablesData[tableName].needsUpdate)
+      tableNames[tableName] = true;
   }
 
   var request = "";