Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Listen for history clear events and re-initialize HTTPSRules #133

Merged
pde merged 1 commit into from
Jan 30, 2014
Merged

Listen for history clear events and re-initialize HTTPSRules #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/components/https-everywhere.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ function HTTPSEverywhere() {
this.obsService.addObserver(this, "profile-before-change", false);
this.obsService.addObserver(this, "profile-after-change", false);
this.obsService.addObserver(this, "sessionstore-windows-restored", false);
this.obsService.addObserver(this, "browser:purge-session-history", false);
}

var pref_service = Components.classes["@mozilla.org/preferences-service;1"]
Expand Down Expand Up @@ -552,17 +553,22 @@ HTTPSEverywhere.prototype = {

// this pref gets set to false and then true during FF 26 startup!
// so do nothing if we're being notified during startup
if (!this.browser_initialised)
if (!this.browser_initialised)
return;
switch (data) {
case "security.mixed_content.block_active_content":
case "extensions.https_everywhere.enable_mixed_rulesets":
var p = CC["@mozilla.org/preferences-service;1"].getService(CI.nsIPrefBranch);
var val = p.getBoolPref("security.mixed_content.block_active_content");
this.log(INFO,"nsPref:changed for "+data + " to " + val);
var val = p.getBoolPref("security.mixed_content.block_active_content");
this.log(INFO,"nsPref:changed for "+data + " to " + val);
HTTPSRules.init();
break;
}
} else if (topic == "browser:purge-session-history") {
// The list of rulesets that have been loaded from the sqlite DB
// constitutes a parallel history store, so we have to clear it.
this.log(DBUG, "History cleared, reloading HTTPSRules to avoid information leak.");
HTTPSRules.init();
}
return;
},
Expand Down