mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 783047 - Update SafeBrowsing URLs to use HTTPS. r=mmc,dcamp sr=gavin
This commit is contained in:
parent
50535e052d
commit
86b9a69241
@ -62,7 +62,6 @@ DEFAULT_FIREFOX_PREFS = {
|
|||||||
'urlclassifier.updateinterval' : 172800,
|
'urlclassifier.updateinterval' : 172800,
|
||||||
# Point the url-classifier to a nonexistent local URL for fast failures.
|
# Point the url-classifier to a nonexistent local URL for fast failures.
|
||||||
'browser.safebrowsing.provider.0.gethashURL' : 'http://localhost/safebrowsing-dummy/gethash',
|
'browser.safebrowsing.provider.0.gethashURL' : 'http://localhost/safebrowsing-dummy/gethash',
|
||||||
'browser.safebrowsing.provider.0.keyURL' : 'http://localhost/safebrowsing-dummy/newkey',
|
|
||||||
'browser.safebrowsing.provider.0.updateURL' : 'http://localhost/safebrowsing-dummy/update',
|
'browser.safebrowsing.provider.0.updateURL' : 'http://localhost/safebrowsing-dummy/update',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -320,15 +320,14 @@ pref("browser.safebrowsing.enabled", true);
|
|||||||
pref("browser.safebrowsing.malware.enabled", true);
|
pref("browser.safebrowsing.malware.enabled", true);
|
||||||
|
|
||||||
// Non-enhanced mode (local url lists) URL list to check for updates
|
// Non-enhanced mode (local url lists) URL list to check for updates
|
||||||
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
|
pref("browser.safebrowsing.provider.0.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2&key=%GOOGLE_API_KEY%");
|
||||||
|
|
||||||
pref("browser.safebrowsing.dataProvider", 0);
|
pref("browser.safebrowsing.dataProvider", 0);
|
||||||
|
|
||||||
// Does the provider name need to be localizable?
|
// Does the provider name need to be localizable?
|
||||||
pref("browser.safebrowsing.provider.0.name", "Google");
|
pref("browser.safebrowsing.provider.0.name", "Google");
|
||||||
pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2");
|
pref("browser.safebrowsing.provider.0.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
|
||||||
pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
|
pref("browser.safebrowsing.provider.0.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
|
||||||
pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
|
|
||||||
|
|
||||||
// HTML report pages
|
// HTML report pages
|
||||||
pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
|
pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
|
||||||
@ -353,7 +352,7 @@ pref("urlclassifier.gethashnoise", 4);
|
|||||||
pref("urlclassifier.max-complete-age", 2700);
|
pref("urlclassifier.max-complete-age", 2700);
|
||||||
|
|
||||||
// URL for checking the reason for a malware warning.
|
// URL for checking the reason for a malware warning.
|
||||||
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// True if this is the first time we are showing about:firstrun
|
// True if this is the first time we are showing about:firstrun
|
||||||
|
@ -790,17 +790,16 @@ pref("browser.safebrowsing.enabled", true);
|
|||||||
pref("browser.safebrowsing.malware.enabled", true);
|
pref("browser.safebrowsing.malware.enabled", true);
|
||||||
pref("browser.safebrowsing.debug", false);
|
pref("browser.safebrowsing.debug", false);
|
||||||
|
|
||||||
pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
|
pref("browser.safebrowsing.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
|
||||||
pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
pref("browser.safebrowsing.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
||||||
pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
pref("browser.safebrowsing.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
|
||||||
pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
|
|
||||||
pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
|
||||||
|
|
||||||
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
||||||
#ifndef MOZILLA_OFFICIAL
|
#ifndef MOZILLA_OFFICIAL
|
||||||
pref("browser.safebrowsing.appRepURL", "https://sb-ssl.google.com/safebrowsing/clientreport/download&key=%GOOGLE_API_KEY%");
|
pref("browser.safebrowsing.appRepURL", "https://sb-ssl.google.com/safebrowsing/clientreport/download&key=%GOOGLE_API_KEY%");
|
||||||
#endif
|
#endif
|
||||||
|
@ -580,15 +580,14 @@ pref("browser.safebrowsing.enabled", true);
|
|||||||
pref("browser.safebrowsing.malware.enabled", true);
|
pref("browser.safebrowsing.malware.enabled", true);
|
||||||
|
|
||||||
// Non-enhanced mode (local url lists) URL list to check for updates
|
// Non-enhanced mode (local url lists) URL list to check for updates
|
||||||
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
|
pref("browser.safebrowsing.provider.0.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2&key=%GOOGLE_API_KEY%");
|
||||||
|
|
||||||
pref("browser.safebrowsing.dataProvider", 0);
|
pref("browser.safebrowsing.dataProvider", 0);
|
||||||
|
|
||||||
// Does the provider name need to be localizable?
|
// Does the provider name need to be localizable?
|
||||||
pref("browser.safebrowsing.provider.0.name", "Google");
|
pref("browser.safebrowsing.provider.0.name", "Google");
|
||||||
pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2");
|
pref("browser.safebrowsing.provider.0.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
|
||||||
pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
|
pref("browser.safebrowsing.provider.0.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
|
||||||
pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
|
|
||||||
|
|
||||||
// HTML report pages
|
// HTML report pages
|
||||||
pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
|
pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
|
||||||
@ -616,7 +615,7 @@ pref("urlclassifier.max-complete-age", 2700);
|
|||||||
pref("urlclassifier.updatecachemax", 41943040);
|
pref("urlclassifier.updatecachemax", 41943040);
|
||||||
|
|
||||||
// URL for checking the reason for a malware warning.
|
// URL for checking the reason for a malware warning.
|
||||||
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// True if this is the first time we are showing about:firstrun
|
// True if this is the first time we are showing about:firstrun
|
||||||
|
@ -353,7 +353,6 @@ class RemoteReftest(RefTest):
|
|||||||
|
|
||||||
# Point the url-classifier to the local testing server for fast failures
|
# Point the url-classifier to the local testing server for fast failures
|
||||||
prefs["browser.safebrowsing.gethashURL"] = "http://127.0.0.1:8888/safebrowsing-dummy/gethash"
|
prefs["browser.safebrowsing.gethashURL"] = "http://127.0.0.1:8888/safebrowsing-dummy/gethash"
|
||||||
prefs["browser.safebrowsing.keyURL"] = "http://127.0.0.1:8888/safebrowsing-dummy/newkey"
|
|
||||||
prefs["browser.safebrowsing.updateURL"] = "http://127.0.0.1:8888/safebrowsing-dummy/update"
|
prefs["browser.safebrowsing.updateURL"] = "http://127.0.0.1:8888/safebrowsing-dummy/update"
|
||||||
# Point update checks to the local testing server for fast failures
|
# Point update checks to the local testing server for fast failures
|
||||||
prefs["extensions.update.url"] = "http://127.0.0.1:8888/extensions-dummy/updateURL"
|
prefs["extensions.update.url"] = "http://127.0.0.1:8888/extensions-dummy/updateURL"
|
||||||
|
@ -585,17 +585,16 @@ pref("browser.safebrowsing.enabled", true);
|
|||||||
pref("browser.safebrowsing.malware.enabled", true);
|
pref("browser.safebrowsing.malware.enabled", true);
|
||||||
pref("browser.safebrowsing.debug", false);
|
pref("browser.safebrowsing.debug", false);
|
||||||
|
|
||||||
pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
pref("browser.safebrowsing.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
|
||||||
pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
pref("browser.safebrowsing.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
||||||
pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
|
pref("browser.safebrowsing.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
|
||||||
pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
|
|
||||||
pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
|
||||||
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
|
pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
|
||||||
|
|
||||||
pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
|
||||||
|
|
||||||
pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
|
pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
|
||||||
|
|
||||||
|
@ -70,7 +70,6 @@ user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
|
|||||||
user_pref("urlclassifier.updateinterval", 172800);
|
user_pref("urlclassifier.updateinterval", 172800);
|
||||||
// Point the url-classifier to the local testing server for fast failures
|
// Point the url-classifier to the local testing server for fast failures
|
||||||
user_pref("browser.safebrowsing.gethashURL", "http://%(server)s/safebrowsing-dummy/gethash");
|
user_pref("browser.safebrowsing.gethashURL", "http://%(server)s/safebrowsing-dummy/gethash");
|
||||||
user_pref("browser.safebrowsing.keyURL", "http://%(server)s/safebrowsing-dummy/newkey");
|
|
||||||
user_pref("browser.safebrowsing.updateURL", "http://%(server)s/safebrowsing-dummy/update");
|
user_pref("browser.safebrowsing.updateURL", "http://%(server)s/safebrowsing-dummy/update");
|
||||||
// Point update checks to the local testing server for fast failures
|
// Point update checks to the local testing server for fast failures
|
||||||
user_pref("extensions.update.url", "http://%(server)s/extensions-dummy/updateURL");
|
user_pref("extensions.update.url", "http://%(server)s/extensions-dummy/updateURL");
|
||||||
|
Loading…
Reference in New Issue
Block a user