From 0c058c88effda740b73744960f86fc363b03f97d Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 2 Aug 2017 16:53:08 -0700 Subject: [PATCH 1/3] Add a functional 'Export Settings' button to the menu --- src/chrome/content/code/HTTPSRules.js | 10 +++++-- src/chrome/content/toolbar_button.js | 22 ++++++++++++++ src/chrome/content/toolbar_button.xul | 4 +++ src/components/https-everywhere.js | 40 +++++++++++++++++++++++++ src/defaults/preferences/preferences.js | 1 + 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js index 1ae74d4b438f..e18a4d1c235f 100644 --- a/src/chrome/content/code/HTTPSRules.js +++ b/src/chrome/content/code/HTTPSRules.js @@ -311,16 +311,19 @@ const RuleWriter = { this.log(WARN, "TARGETS IS NULL"); var data = this.readFromFile(file); if (!data) return null; - return this.readFromString(data, rule_store, ruleset_id); + return this.readFromString(data, rule_store, ruleset_id, true); }, - readFromString: function(data, rule_store, ruleset_id) { + readFromString: function(data, rule_store, ruleset_id, custom) { try { var xmlruleset = dom_parser.parseFromString(data, "text/xml"); } catch(e) { // file has been corrupted; XXX: handle error differently this.log(WARN,"Error in XML data: " + e + "\n" + data); return null; } + if(custom){ + HTTPSRules.custom_rulesets.push(data); + } this.parseOneRuleset(xmlruleset.documentElement, rule_store, ruleset_id); }, @@ -406,6 +409,7 @@ const RuleWriter = { const HTTPSRules = { init: function() { try { + this.custom_rulesets = []; this.rulesets = []; this.targets = {}; // dict mapping target host pattern -> list of // applicable ruleset ids @@ -593,7 +597,7 @@ const HTTPSRules = { // Load a ruleset by numeric id, e.g. 234 loadRulesetById: function(ruleset_id) { - RuleWriter.readFromString(this.rulesetStrings[ruleset_id], this, ruleset_id); + RuleWriter.readFromString(this.rulesetStrings[ruleset_id], this, ruleset_id, false); }, // Get all rulesets matching a given target, lazy-loading from DB as necessary. diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index 773b6eedb544..91ef7ee39db9 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -439,3 +439,25 @@ function migratePreferences(gBrowser) { HTTPSEverywhere.prefs.setIntPref("prefs_version", prefs_version+1); } } + +function exportSettingsToFile(){ + var settings = JSON.stringify(HTTPSEverywhere.exportSettings()); + + var nsIFilePicker = CI.nsIFilePicker; + var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); + fp.init(window, "Save Settings to File", nsIFilePicker.modeSave); + fp.defaultString = "https_everywhere_settings.json"; + fp.defaultExtension = "json"; + fp.addToRecentDocs = true; + var res = fp.show(); + if (res != nsIFilePicker.returnCancel){ + var file_path = fp.file.path; + var file = CC["@mozilla.org/file/local;1"].createInstance(CI.nsILocalFile); + file.initWithPath(file_path); + + output_stream = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(CI.nsIFileOutputStream); + output_stream.init(file, 0x02 | 0x08 | 0x20, 0600, 0); + output_stream.write(settings, settings.length); + output_stream.close(); + } +} diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul index 58eb69b65c95..68e4bc7ee0a7 100644 --- a/src/chrome/content/toolbar_button.xul +++ b/src/chrome/content/toolbar_button.xul @@ -44,6 +44,8 @@ + + Date: Wed, 2 Aug 2017 21:24:08 -0700 Subject: [PATCH 2/3] Adding a warning tab which opens only if settings are changed, and only once. --- src/chrome/content/export-settings.js | 8 ++++++ src/chrome/content/export-settings.xul | 26 +++++++++++++++++++ src/chrome/content/toolbar_button.js | 20 +-------------- src/components/https-everywhere.js | 33 +++++++++++++++++++++++++ src/defaults/preferences/preferences.js | 1 + 5 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 src/chrome/content/export-settings.js create mode 100644 src/chrome/content/export-settings.xul diff --git a/src/chrome/content/export-settings.js b/src/chrome/content/export-settings.js new file mode 100644 index 000000000000..def8845c1af4 --- /dev/null +++ b/src/chrome/content/export-settings.js @@ -0,0 +1,8 @@ +const CC = Components.classes; +let HTTPSEverywhere = CC["@eff.org/https-everywhere;1"] + .getService(Components.interfaces.nsISupports) + .wrappedJSObject; + +function exportSettingsToFile(){ + HTTPSEverywhere.exportSettingsToFile(window); +} diff --git a/src/chrome/content/export-settings.xul b/src/chrome/content/export-settings.xul new file mode 100644 index 000000000000..9f5f770f60d4 --- /dev/null +++ b/src/chrome/content/export-settings.xul @@ -0,0 +1,26 @@ + + + + + + + +