Bug 336832 (for tony@ponderer.org) set pref defaults for safe browsing

browser/app/profile/firefox.js

@@ -464,3 +464,22 @@ pref("browser.contentHandlers.types.3.title", "iGoogle/Google Reader");
 pref("browser.contentHandlers.types.3.uri", "http://fusion.google.com/add?feedurl=%s");
 pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
 #endif
+
+#ifdef MOZ_SAFE_BROWSING
+// Safe browsing does nothing unless both these prefs are set.
+pref("browser.safebrowsing.enabled", true);
+pref("browser.safebrowsing.remoteLookups", false);
+
+// One of these must be set depending on if remoteLookups is true or false.
+pref("browser.safebrowsing.provider.0.lookupURL", "http://sb.google.com/safebrowsing/lookup?");
+pref("urlclassifier.provider.0.updateURL", "http://sb.google.com/safebrowsing/update?");
+
+pref("browser.safebrowsing.provider.0.keyURL", "https://www.google.com/safebrowsing/getkey?");
+pref("browser.safebrowsing.provider.0.faqURL", "http://www.google.com/tools/service/npredir?r=ff_sb_faq#phishing");
+pref("browser.safebrowsing.provider.0.genericReportURL", "http://www.google.com/safebrowsing/report_general/?continue=http%3A%2F%2Fwww.google.com%2Ftools%2Ffirefox%2Fsafebrowsing%2Fsubmit_success.html");
+pref("browser.safebrowsing.provider.0.homeURL", "http://www.google.com/tools/service/npredir?r=ff_sb_home");
+pref("browser.safebrowsing.provider.0.reportErrorURL", "http://www.google.com/safebrowsing/report_error/?continue=http%3A%2F%2Fwww.google.com%2Ftools%2Ffirefox%2Fsafebrowsing%2Fsubmit_success.html");
+pref("browser.safebrowsing.provider.0.reportPhishURL", "http://www.google.com/safebrowsing/report_phish/?continue=http%3A%2F%2Fwww.google.com%2Ftools%2Ffirefox%2Fsafebrowsing%2Fsubmit_success.html");
+pref("browser.safebrowsing.provider.0.reportURL", "http://sb.google.com/safebrowsing/report?");
+pref("browser.safebrowsing.provider.0.testURL", "http://www.google.com/tools/firefox/safebrowsing/phish-o-rama.html");
+#endif

browser/components/safebrowsing/content/globalstore.js

@@ -68,7 +68,7 @@ PROT_GlobalStore.getPref_ = function(prefname) {
  *          is enabled (i.e., whether SafeBrowsing is enabled)
  */
 PROT_GlobalStore.getPhishWardenEnabledPrefName = function() {
-  return "safebrowsing.enabled";
+  return "browser.safebrowsing.enabled";
 }
 
 /**
@@ -76,7 +76,7 @@ PROT_GlobalStore.getPhishWardenEnabledPrefName = function() {
  *          checking (advanced protection)
  */
 PROT_GlobalStore.getServerCheckEnabledPrefName = function() {
-  return "safebrowsing.remoteLookups";
+  return "browser.safebrowsing.remoteLookups";
 }
 
 /**
@@ -140,7 +140,7 @@ PROT_GlobalStore.getPolicyURL = function() {
  *          want to report a false positive or negative).
  */
 PROT_GlobalStore.getGenericPhishSubmitURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.genericReportURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.genericReportURL");
 }
 
 /**
@@ -148,7 +148,7 @@ PROT_GlobalStore.getGenericPhishSubmitURL = function() {
  *          report a false positive (i.e. a non-phishy page)
  */
 PROT_GlobalStore.getFalsePositiveURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.reportErrorURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.reportErrorURL");
 }
 
 /**
@@ -156,7 +156,7 @@ PROT_GlobalStore.getFalsePositiveURL = function() {
  *          report a false negative (i.e. a phishy page)
  */
 PROT_GlobalStore.getSubmitUrl = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.reportPhishURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.reportPhishURL");
 }
 
 /**
@@ -165,7 +165,7 @@ PROT_GlobalStore.getSubmitUrl = function() {
  *          "more info" in the bubble or the product link in the preferences.
  */
 PROT_GlobalStore.getHomePageURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.homeURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.homeURL");
 }
 
 /**
@@ -174,7 +174,7 @@ PROT_GlobalStore.getHomePageURL = function() {
  *          "phishing FAQ" in the bubble.
  */
 PROT_GlobalStore.getPhishingFaqURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.faqURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.faqURL");
 }
 
 /**
@@ -183,21 +183,21 @@ PROT_GlobalStore.getPhishingFaqURL = function() {
  */
 PROT_GlobalStore.getTestURLs = function() {
   // TODO: return all test urls
-  return [PROT_GlobalStore.getPref_("safebrowsing.provider.0.testURL")];
+  return [PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.testURL")];
 }
 
 /**
  * @returns String giving url to use for lookups (used in advanced mode)
  */
 PROT_GlobalStore.getLookupserverURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.lookupURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.lookupURL");
 }
 
 /**
  * @returns String giving url to use for updates (diff of lists)
  */
 PROT_GlobalStore.getUpdateserverURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.updateURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.updateURL");
 }
 
 /**
@@ -205,12 +205,12 @@ PROT_GlobalStore.getUpdateserverURL = function() {
  * @returns String giving url to use to report actions (advanced mode only
  */
 PROT_GlobalStore.getActionReportURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.reportURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.reportURL");
 }
 
 /**
  * @returns String giving url to use for re-keying
  */
 PROT_GlobalStore.getGetKeyURL = function() {
-  return PROT_GlobalStore.getPref_("safebrowsing.provider.0.keyURL");
+  return PROT_GlobalStore.getPref_("browser.safebrowsing.provider.0.keyURL");
 }

browser/components/safebrowsing/content/tr-fetcher.js

@@ -70,7 +70,7 @@ PROT_TRFetcher.TRY_REKEYING_RESPONSE = "pleaserekey";
 PROT_TRFetcher.prototype.extraQueryParams = {
   sourceid: "firefox-antiphish",
   features: "TrustRank",
-  client: "navclient-auto-ffox"
+  client: "navclient-auto-ffox2"
 };
 
 /**

toolkit/components/url-classifier/content/url-crypto-key-manager.js

@@ -69,7 +69,9 @@
 const kKeyFilename = "kf.txt";
 
 // If we don't have a key, we can get one at this url.
-const kGetKeyUrl = "safebrowsing.provider.0.keyURL";
+// XXX We shouldn't be referencing browser.safebrowsing. from here.  This
+// should be an constructor param or settable some other way.
+const kGetKeyUrl = "browser.safebrowsing.provider.0.keyURL";
 
 /**
  * A key manager for UrlCrypto. There should be exactly one of these