Bug 344897: anti-phishing needs different update urls for official builds. r=bsmedberg, rstrong

browser/app/profile/firefox.js

@@ -181,8 +181,8 @@ pref("general.autoScroll", true);
 // is the default browser.
 pref("browser.shell.checkDefaultBrowser", true);
 
-// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
-// XXXBlake Remove this stupid pref
+// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
+// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
 pref("browser.startup.page",                1);
 pref("browser.startup.homepage",	          "resource:/browserconfig.properties");
 
@@ -279,12 +279,7 @@ pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Nam
 
 // Scripts & Windows prefs
 pref("dom.disable_open_during_load",              true);
-#ifdef DEBUG
-pref("javascript.options.showInConsole",          true);
-#else
 pref("javascript.options.showInConsole",          false);
-#endif
-
 // Make the status bar reliably present and unaffected by pages
 pref("dom.disable_window_open_feature.status",    true);
 // This is the pref to control the location bar, change this to true to 
@@ -468,8 +463,6 @@ pref("layout.spellcheckDefault", 1);
 pref("view_source.editor.path", "");
 pref("view_source.editor.external", false);
 
-pref("browser.send_pings", true);
-
 #ifdef MOZ_FEEDS
 pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
 pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
@@ -499,21 +492,18 @@ pref("browser.safebrowsing.enabled", true);
 pref("browser.safebrowsing.remoteLookups", false);
 
 // Non-enhanced mode (local url lists) URL list to check for updates
-pref("browser.safebrowsing.provider.0.updateURL", "http://sb.google.com/safebrowsing/update?client=navclient-auto-ffox2&");
+pref("browser.safebrowsing.provider.0.updateURL", "http://sb.google.com/safebrowsing/update?client={moz:client}&mozver={moz:version}-{moz:buildid}&");
 
 pref("browser.safebrowsing.dataProvider", 0);
 
 // Does the provider name need to be localizable?
 pref("browser.safebrowsing.provider.0.name", "Google");
-pref("browser.safebrowsing.provider.0.lookupURL", "http://sb.google.com/safebrowsing/lookup?sourceid=firefox-antiphish&features=TrustRank&client=navclient-auto-ffox2&");
+pref("browser.safebrowsing.provider.0.lookupURL", "http://sb.google.com/safebrowsing/lookup?sourceid=firefox-antiphish&features=TrustRank&client={moz:client}&mozver={moz:version}-{moz:buildid}&");
 pref("browser.safebrowsing.provider.0.keyURL", "https://www.google.com/safebrowsing/getkey?");
 pref("browser.safebrowsing.provider.0.reportURL", "http://sb.google.com/safebrowsing/report?");
 
-// privacy policy -- must be chrome URL
-pref("browser.safebrowsing.provider.0.privacy.url", "chrome://browser/content/preferences/phishEULA.xhtml");
-
 // HTML report pages
-pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}");
+pref("browser.safebrowsing.provider.0.reportGenericURL", "http://www.mozilla.org/projects/bonecho/anti-phishing/report_general/?hl={moz:locale}");
+pref("browser.safebrowsing.provider.0.reportErrorURL", "http://www.mozilla.org/projects/bonecho/anti-phishing/report_error/?hl={moz:locale}");
+pref("browser.safebrowsing.provider.0.reportPhishURL", "http://www.mozilla.org/projects/bonecho/anti-phishing/report_phish/?hl={moz:locale}");
 #endif

browser/components/safebrowsing/Makefile.in

@@ -49,4 +49,14 @@ ifdef ENABLE_TESTS
 DIRS     += tests
 endif
 
+ifneq ($(origin BUILD_OFFICIAL)_$(origin MOZILLA_OFFICIAL),undefined_undefined)
+DEFINES += -DOFFICIAL_BUILD=1
+endif
+
+# EXTRA_COMPONENTS installs components written in JS to dist/bin/components
+EXTRA_PP_COMPONENTS = \
+         content/globalstore.js \
+         src/nsSafebrowsingApplication.js \
+         $(NULL)
+
 include $(topsrcdir)/config/rules.mk

browser/components/safebrowsing/content/globalstore.js

@@ -19,6 +19,7 @@
  *
  * Contributor(s):
  *   Fritz Schneider <fritz@google.com> (original author)
+ *   J. Paul Reed <preed@mozilla.com>
  *
  * 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
@@ -53,7 +54,16 @@
 const kDataProviderIdPref = 'browser.safebrowsing.dataProvider';
 const kProviderBasePref = 'browser.safebrowsing.provider.';
 
+#ifdef OFFICIAL_BUILD
+const MOZ_OFFICIAL_BUILD = true;
+#else
+const MOZ_OFFICIAL_BUILD = false;
+#endif
+
 const MOZ_PARAM_LOCALE = /\{moz:locale\}/g;
+const MOZ_PARAM_CLIENT = /\{moz:client\}/g;
+const MOZ_PARAM_BUILDID = /\{moz:buildid\}/g;
+const MOZ_PARAM_VERSION = /\{moz:version\}/g;
 
 /**
  * Information regarding the data provider.
@@ -133,8 +143,16 @@ PROT_DataProvider.prototype.updateListManager_ = function() {
 PROT_DataProvider.prototype.getUrlPref_ = function(prefName) {
   var url = this.prefs_.getPref(prefName);
 
+  var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                          .getService(Components.interfaces.nsIXULAppInfo);
+
+  var mozClientStr = MOZ_OFFICIAL_BUILD ? 'navclient-auto-ffox' : appInfo.name;
+
   // Parameter substitution
   url = url.replace(MOZ_PARAM_LOCALE, this.getLocale_());
+  url = url.replace(MOZ_PARAM_CLIENT, mozClientStr + appInfo.version);
+  url = url.replace(MOZ_PARAM_BUILDID, appInfo.appBuildID);
+  url = url.replace(MOZ_PARAM_VERSION, appInfo.platformVersion);
   return url;
 }
 

browser/components/safebrowsing/src/Makefile.in

@@ -55,7 +55,4 @@ REQUIRES = \
 
 CPPSRCS = nsDocNavStartProgressListener.cpp
 
-# EXTRA_COMPONENTS installs components written in JS to dist/bin/components
-EXTRA_PP_COMPONENTS = nsSafebrowsingApplication.js
-
 include $(topsrcdir)/config/rules.mk