nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1907732 - (part 1) Exempt addon principals from clearing with site data. r=pbz,robwu a=RyanVM

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D219825
This commit is contained in:
Harshit Sohaney 2024-08-28 15:47:03 +00:00
parent 3c4437a0e6
commit 2606866d25
1 changed files with 47 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

50
toolkit/components/cleardata/ClearDataService.sys.mjs
View file

@ -1744,14 +1744,30 @@ const BounceTrackingProtectionStateCleaner = {
const StoragePermissionsCleaner = { const StoragePermissionsCleaner = {
async deleteByRange(aFrom) { async deleteByRange(aFrom) {
// We lack the ability to clear by range, but can clear from a certain time to now // We lack the ability to clear by range, but can clear from a certain time to now
// We have to divice aFrom by 1000 to convert the time from ms to microseconds // Convert aFrom from microseconds to ms
Services.perms.removeByTypeSince("storage-access", aFrom / 1000); Services.perms.removeByTypeSince("storage-access", aFrom / 1000);
Services.perms.removeByTypeSince("persistent-storage", aFrom / 1000);
let persistentStoragePermissions = Services.perms.getAllByTypeSince(
"persistent-storage",
aFrom / 1000
);
persistentStoragePermissions.forEach(perm => {
// If it is an Addon Principal, do nothing.
// We want their persistant-storage permissions to remain (Bug 1907732)
if (this._isAddonPrincipal(perm.principal)) {
return;
}
Services.perms.removePermission(perm);
});
}, },
async deleteByPrincipal(aPrincipal) { async deleteByPrincipal(aPrincipal) {
Services.perms.removeFromPrincipal(aPrincipal, "storage-access"); Services.perms.removeFromPrincipal(aPrincipal, "storage-access");
// Only remove persistent-storage if it is not an extension principal (Bug 1907732)
if (!this._isAddonPrincipal(aPrincipal)) {
Services.perms.removeFromPrincipal(aPrincipal, "persistent-storage"); Services.perms.removeFromPrincipal(aPrincipal, "persistent-storage");
}
}, },
async deleteByHost(aHost) { async deleteByHost(aHost) {
@ -1783,14 +1799,40 @@ const StoragePermissionsCleaner = {
async deleteAll() { async deleteAll() {
Services.perms.removeByType("storage-access"); Services.perms.removeByType("storage-access");
Services.perms.removeByType("persistent-storage");
// We don't want to clear the persistent-storage permission from addons (Bug 1907732)
let persistentStoragePermissions = Services.perms.getAllByTypes([
"persistent-storage",
]);
persistentStoragePermissions.forEach(perm => {
if (this._isAddonPrincipal(perm.principal)) {
return;
}
Services.perms.removePermission(perm);
});
}, },
_getStoragePermissions() { _getStoragePermissions() {
return Services.perms.getAllByTypes([ let storagePermissions = Services.perms.getAllByTypes([
"storage-access", "storage-access",
"persistent-storage", "persistent-storage",
]); ]);
return storagePermissions.filter(
permission =>
!this._isAddonPrincipal(permission.principal) ||
permission.type == "storage-access"
);
},
_isAddonPrincipal(aPrincipal) {
return (
// AddonPolicy() returns a WebExtensionPolicy that has been registered before,
// typically during extension startup. Since Disabled or uninstalled add-ons
// don't appear there, we should use schemeIs instead
aPrincipal.schemeIs("moz-extension")
);
}, },
}; };