Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1816064 - Part 4: Don't generate randomization key if unnecessary. r=tjr

Browse Source 
We don't need to generate the randomization key if fingerprinting
protection is disabled. This could happen if fingerprinting protection
is disabled or exempted from normal windows. In these cases, we don't
need to generate the key, which can save us the cost of generating the
key.

Differential Revision: https://phabricator.services.mozilla.com/D171397
This commit is contained in:
Tim Huang 2023-03-02 21:47:07 +00:00
parent 5a71baef51
commit c3a3a5ebc3
2 changed files with 131 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/components/resistfingerprinting/nsRFPService.cpp
View File

@ -1184,6 +1184,17 @@ Maybe<nsTArray<uint8_t>> nsRFPService::GenerateKey(nsIURI* aTopLevelURI,
return Nothing();
}
// Return nothing if fingerprinting resistance is disabled or fingerprinting
// resistance is exempted from the normal windows. Note that we still need to
// generate the key for exempted domains because there could be unexempted
// sub-documents that need the key.
if (!nsContentUtils::ShouldResistFingerprinting("Coarse Efficiency Check") ||
(!aIsPrivate &&
StaticPrefs::privacy_resistFingerprinting_testGranularityMask() &
0x02 /* NonPBMExemptMask */)) {
return Nothing();
}
const nsID& sessionKey = aIsPrivate
? service->mPrivateBrowsingSessionKey.ref()
: service->mBrowsingSessionKey.ref();

122
toolkit/components/resistfingerprinting/tests/browser/browser_fingerprinting_randomization_key.js
View File

@ -166,10 +166,57 @@ add_task(async function test_randomization_disabled() {
BrowserTestUtils.removeTab(tab);
});
// Test accessing the fingerprinting randomization key will throw if
// fingerprinting resistance is disabled.
add_task(async function test_randomization_disabled_with_rfp_disabled() {
await SpecialPowers.pushPrefEnv({
set: [
["privacy.resistFingerprinting.randomization.enabled", true],
["privacy.resistFingerprinting", false],
],
});
// Ensure accessing the fingerprinting randomization key of the browser
// element will throw if fingerprinting randomization is disabled.
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_DOMAIN);
try {
let key =
tab.linkedBrowser.cookieJarSettings.fingerprintingRandomizationKey;
ok(
false,
`Accessing the fingerprinting randomization key should throw when fingerprinting resistance is disabled. ${key}`
);
} catch (e) {
ok(
true,
"It should throw when getting the key when fingerprinting resistance is disabled."
);
}
// Ensure accessing the fingerprinting randomization key of the top-level
// document will throw if fingerprinting randomization is disabled.
try {
await SpecialPowers.spawn(tab.linkedBrowser, [], _ => {
return content.document.cookieJarSettings.fingerprintingRandomizationKey;
});
} catch (e) {
ok(
true,
"It should throw when getting the key when fingerprinting resistance is disabled."
);
}
BrowserTestUtils.removeTab(tab);
});
// Test the fingerprinting randomization key generation.
add_task(async function test_generate_randomization_key() {
await SpecialPowers.pushPrefEnv({
set: [["privacy.resistFingerprinting.randomization.enabled", true]],
set: [
["privacy.resistFingerprinting.randomization.enabled", true],
["privacy.resistFingerprinting", true],
],
});
for (let private of [true, false]) {
@ -260,7 +307,10 @@ add_task(async function test_generate_randomization_key() {
// ends.
add_task(async function test_reset_key_after_pbm_session_ends() {
await SpecialPowers.pushPrefEnv({
set: [["privacy.resistFingerprinting.randomization.enabled", true]],
set: [
["privacy.resistFingerprinting.randomization.enabled", true],
["privacy.resistFingerprinting", true],
],
});
let privateWin = await BrowserTestUtils.openNewBrowserWindow({
@ -305,3 +355,71 @@ add_task(async function test_reset_key_after_pbm_session_ends() {
BrowserTestUtils.removeTab(tab);
await BrowserTestUtils.closeWindow(privateWin);
});
// Test accessing the fingerprinting randomization key will throw in normal
// windows if we exempt fingerprinting protection in normal windows.
add_task(async function test_randomization_with_exempted_normal_window() {
await SpecialPowers.pushPrefEnv({
set: [
["privacy.resistFingerprinting.randomization.enabled", true],
["privacy.resistFingerprinting", true],
["privacy.resistFingerprinting.testGranularityMask", 2],
],
});
// Ensure accessing the fingerprinting randomization key of the browser
// element will throw if fingerprinting randomization is exempted from normal
// windows.
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_DOMAIN);
try {
let key =
tab.linkedBrowser.cookieJarSettings.fingerprintingRandomizationKey;
ok(
false,
`Accessing the fingerprinting randomization key should throw when fingerprinting resistance is exempted in normal windows. ${key}`
);
} catch (e) {
ok(
true,
"It should throw when getting the key when fingerprinting resistance is exempted in normal windows."
);
}
// Ensure accessing the fingerprinting randomization key of the top-level
// document will throw if fingerprinting randomization is exempted from normal
// windows.
try {
await SpecialPowers.spawn(tab.linkedBrowser, [], _ => {
return content.document.cookieJarSettings.fingerprintingRandomizationKey;
});
} catch (e) {
ok(
true,
"It should throw when getting the key when fingerprinting resistance is exempted in normal windows."
);
}
BrowserTestUtils.removeTab(tab);
// Open a private window and check the key can be accessed there.
let privateWin = await BrowserTestUtils.openNewBrowserWindow({
private: true,
});
// Open a tab in the private window.
tab = await BrowserTestUtils.openNewForegroundTab(
privateWin.gBrowser,
TEST_DOMAIN
);
// Access the key, this shouldn't throw an error.
await getRandomKeyHexFromBrowser(
tab.linkedBrowser,
TEST_DOMAIN,
TEST_DOMAIN_THIRD
);
BrowserTestUtils.removeTab(tab);
await BrowserTestUtils.closeWindow(privateWin);
});