wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 17:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

[Pale-Moon] Issue #1711 - Remove cert9.db and key4.db from profile if they exist.

Browse source 
This resolves #1711
This commit is contained in:
Pale Moon 2020-01-23 22:22:48 +01:00 • committed by Roy Tam
commit 34a4c07937
1 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
application/palemoon/components/nsBrowserGlue.js
View file

@ -1198,7 +1198,7 @@ BrowserGlue.prototype = {
}, },
_migrateUI: function BG__migrateUI() { _migrateUI: function BG__migrateUI() {
const UI_VERSION = 20; const UI_VERSION = 21;
const BROWSER_DOCURL = "chrome://browser/content/browser.xul#"; const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
let currentUIVersion = 0; let currentUIVersion = 0;
try { try {
@ -1397,12 +1397,6 @@ BrowserGlue.prototype = {
this._notifyNotificationsUpgrade(); this._notifyNotificationsUpgrade();
} }
if (this._dirty)
this._dataSource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
delete this._rdf;
delete this._dataSource;
if (currentUIVersion < 18) { if (currentUIVersion < 18) {
// Make sure the doNotTrack value conforms to the conversion from // Make sure the doNotTrack value conforms to the conversion from
// three-state to two-state. (This reverts a setting of "please track me" // three-state to two-state. (This reverts a setting of "please track me"
@ -1438,6 +1432,34 @@ BrowserGlue.prototype = {
Services.prefs.clearUserPref("security.cert_pinning.enforcement_level"); Services.prefs.clearUserPref("security.cert_pinning.enforcement_level");
} }
if (currentUIVersion < 21) {
// Remove key4.db and cert9.db if those files exist
// XXX: Remove this code block once we actually start using them.
let dsCertFile = Cc["@mozilla.org/file/directory_service;1"]
.getService(Ci.nsIProperties)
.get("ProfD", Ci.nsIFile);
dsKeyFile = dsCertFile.clone();
dsCertFile.append("cert9.db");
if (dsCertFile.exists()) {
try {
dsCertFile.remove(false);
} catch(e) { }
}
dsKeyFile.append("key4.db");
if (dsKeyFile.exists()) {
try {
dsKeyFile.remove(false);
} catch(e) { }
}
}
// Clear out dirty storage
if (this._dirty)
this._dataSource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
delete this._rdf;
delete this._dataSource;
// Update the migration version. // Update the migration version.
Services.prefs.setIntPref("browser.migration.version", UI_VERSION); Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
}, },