Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1337056 - Part 11: Change the permission key assertion to a fatal assert on debug builds, r=ehsan

Browse Source 
MozReview-Commit-ID: HTxvlomRKWy
This commit is contained in:
Michael Layzell 2017-03-15 16:15:47 -04:00
parent 83c788960c
commit bd18aec002
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/ipc/ContentParent.cpp
View File

@ -5111,14 +5111,19 @@ void
ContentParent::EnsurePermissionsByKey(const nsCString& aKey)
{
#ifdef MOZ_PERMISSIONS
// NOTE: Make sure to initialize the permission manager before updating the
// mActivePermissionKeys list. If the permission manager is being initialized
// by this call to GetPermissionManager, and we've added the key to
// mActivePermissionKeys, then the permission manager will send down a
// SendAddPermission before receiving the SendSetPermissionsWithKey message.
nsCOMPtr<nsIPermissionManager> permManager =
services::GetPermissionManager();
if (mActivePermissionKeys.Contains(aKey)) {
return;
}
mActivePermissionKeys.PutEntry(aKey);
nsCOMPtr<nsIPermissionManager> permManager =
services::GetPermissionManager();
nsTArray<IPC::Permission> perms;
nsresult rv = permManager->GetPermissionsWithKey(aKey, perms);
if (NS_WARN_IF(NS_FAILED(rv))) {

16
extensions/cookie/nsPermissionManager.cpp
View File

@ -647,20 +647,18 @@ nsPermissionManager::PermissionKey::CreateFromPrincipal(nsIPrincipal* aPrincipal
}
#ifdef DEBUG
// Creating a PermissionsKey to look up a permission if we haven't had those keys
// synced down yet is problematic, so we do a check here and emit an assertion if
// we see it happening.
// Creating a PermissionsKey to look up a permission if we haven't had those
// keys synced down yet is problematic, so we do a check here and crash on
// debug builds if we see it happening.
if (XRE_IsContentProcess()) {
nsAutoCString permissionKey;
GetKeyForPrincipal(aPrincipal, permissionKey);
// NOTE: Theoretically an addon could ask for permissions which the process
// wouldn't have access to, and we wouldn't want to crash the process in
// this case, but our chrome code should never do this. Using NS_ASSERTION
// here so that we can test fetching unavaliable permissions in tests.
NS_ASSERTION(gPermissionManager->mAvailablePermissionKeys.Contains(permissionKey),
nsPrintfCString("This content process hasn't received the "
if (!gPermissionManager->mAvailablePermissionKeys.Contains(permissionKey)) {
NS_WARNING(nsPrintfCString("This content process hasn't received the "
"permissions for %s yet", permissionKey.get()).get());
MOZ_CRASH("The content process hasn't recieved permissions for an origin yet.");
}
}
#endif

6
extensions/cookie/test/browser.ini
View File

@ -2,4 +2,8 @@
[browser_test_favicon.js]
[browser_permmgr_sync.js]
skip-if = !e10s # This tests e10s specific behavior
# The browser_permmgr_sync test tests e10s specific behavior, and runs code
# paths which would hit the debug only assertion in
# nsPermissionManager::PermissionKey::CreateFromPrincipal. Because of this, it
# is only run in e10s opt builds.
skip-if = debug || !e10s