Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1395733 - Ensure the default value of urlclassifier.malwareTable is always sorted. r=gcp

Browse Source 
MozReview-Commit-ID: 10M2ZpDyAI9

--HG--
extra : rebase_source : 4523a0a1fd3adbdc8f0c13676548409ee9536f06
This commit is contained in:
Francois Marier 2017-08-31 14:54:11 -07:00
parent 3c8567b60d
commit 530db90579
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -1720,7 +1720,7 @@ pref("extensions.formautofill.loglevel", "Warn");
pref("browser.sessionstore.restore_tabs_lazily", true);
// Enable safebrowsing v4 tables (suffixed by "-proto") update.
pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-malware-simple,test-unwanted-simple,test-harmful-simple");
pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple");
#ifdef MOZILLA_OFFICIAL
pref("urlclassifier.phishTable", "goog-phish-proto,test-phish-simple");
#else

2
modules/libpref/init/all.js
View File

@ -5374,7 +5374,7 @@ pref("dom.flyweb.enabled", false);
pref("dom.mapped_arraybuffer.enabled", true);
// The tables used for Safebrowsing phishing and malware checks
pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple,test-harmful-simple");
pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-harmful-simple,test-malware-simple,test-unwanted-simple");
#ifdef MOZILLA_OFFICIAL
// In the official build, we are allowed to use google's private
// phishing list "goog-phish-shavar". See Bug 1288840.

4
toolkit/components/url-classifier/tests/unit/test_malwaretable_pref.js Normal file
View File

@ -0,0 +1,4 @@
// Ensure that the default value of malwareTable is always in sorted order
let originalValue = prefBranch.getCharPref("urlclassifier.malwareTable");
let sortedValue = originalValue.split(",").sort().join(",");
do_check_eq(originalValue, sortedValue);

1
toolkit/components/url-classifier/tests/unit/xpcshell.ini
View File

@ -21,5 +21,6 @@ support-files =
[test_digest256.js]
[test_listmanager.js]
[test_pref.js]
[test_malwaretable_pref.js]
[test_safebrowsing_protobuf.js]
[test_platform_specific_threats.js]