corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1919558 - Part 4: Allow default permissions to be modified through AddInternal in permission manager r=pbz,permissions-reviewers

Browse Source 
Allow default permissions to be deleted by adding a new permission with same
origin and type, and value UNKNOWN_ACTION, analogous to how normal permissions
currently already get deleted. This can then later be used by the remote
permission service (D222649) to remove default permissions it previously added
if they have been removed in remote settings.

Also add brackets to make clang-tidy happy.

Differential Revision: https://phabricator.services.mozilla.com/D222651
This commit is contained in:
Malte Jürgens
2024-11-08 15:08:32 +00:00
parent 03bbd34260
commit cef2e4d5b6
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/permissions/PermissionManager.cpp
View File

@@ -1771,6 +1771,9 @@ nsresult PermissionManager::AddInternal(
const bool aAllowPersistInPrivateBrowsing) {
MOZ_ASSERT(NS_IsMainThread());
// If this is a default permission, no changes should not be written to disk.
MOZ_ASSERT((aID != cIDPermissionIsDefault) || (aDBOperation != eWriteToDB));
EnsureReadCompleted();
nsresult rv = NS_OK;
@@ -1881,23 +1884,26 @@ nsresult PermissionManager::AddInternal(
if (aPermission == oldPermissionEntry.mPermission &&
aExpireType == oldPermissionEntry.mExpireType &&
(aExpireType == nsIPermissionManager::EXPIRE_NEVER ||
aExpireTime == oldPermissionEntry.mExpireTime))
aExpireTime == oldPermissionEntry.mExpireTime)) {
op = eOperationNone;
else if (oldPermissionEntry.mID == cIDPermissionIsDefault)
// The existing permission is one added as a default and the new
// permission doesn't exactly match so we are replacing the default. This
// is true even if the new permission is UNKNOWN_ACTION (which means a
// "logical remove" of the default)
} else if (oldPermissionEntry.mID == cIDPermissionIsDefault &&
aID != cIDPermissionIsDefault) {
// An existing default permission already exists, but the new permission
// isn't a default permission. This case requires some special handing.
op = eOperationReplacingDefault;
else if (aID == cIDPermissionIsDefault)
} else if (oldPermissionEntry.mID != cIDPermissionIsDefault &&
aID == cIDPermissionIsDefault) {
// We are adding a default permission but a "real" permission already
// exists. This almost-certainly means we just did a removeAllSince and
// are re-importing defaults - so we can ignore this.
// exists. This means we don't have to do anything here.
op = eOperationNone;
else if (aPermission == nsIPermissionManager::UNKNOWN_ACTION)
} else if (aPermission == nsIPermissionManager::UNKNOWN_ACTION) {
// At this point, both the old and new permission are either both default
// permissions, or both not default permissions. Now we only need to check
// wether to change or remove the old permission.
op = eOperationRemoving;
else
} else {
op = eOperationChanging;
}
}
// child processes should *always* be passed a modificationTime of zero.