From cea76226391cbf048d6ca334d5329c7b539b6824 Mon Sep 17 00:00:00 2001 From: Tom Ritter Date: Thu, 2 May 2024 13:55:43 +0000 Subject: [PATCH] Bug 1878716: Add a test that confirms the expected default behavior in PBM r=timhuang Differential Revision: https://phabricator.services.mozilla.com/D206128 --- .../test/browser/browser_canvas_iframes.js | 5 ++++ .../test/browser/browser_canvas_popups.js | 5 ++++ .../browser/browser_canvascompare_iframes.js | 5 ++++ ...rowser_canvascompare_iframes_aboutblank.js | 5 ++++ .../browser_canvascompare_iframes_blob.js | 5 ++++ .../browser/browser_canvascompare_popups.js | 5 ++++ ...browser_canvascompare_popups_aboutblank.js | 5 ++++ .../browser_canvascompare_popups_blob.js | 5 ++++ .../browser_canvascompare_popups_data.js | 5 ++++ .../resistfingerprinting/test/browser/head.js | 24 +++++++++++++++++++ 10 files changed, 69 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvas_iframes.js b/browser/components/resistfingerprinting/test/browser/browser_canvas_iframes.js index 86e6d422ef22..2b6497cc85b8 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvas_iframes.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvas_iframes.js @@ -135,6 +135,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomized); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvas_popups.js b/browser/components/resistfingerprinting/test/browser/browser_canvas_popups.js index c9c919cc84e9..234529b98838 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvas_popups.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvas_popups.js @@ -132,6 +132,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomized); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes.js index c7ad46fbf225..a4da3aa9ec76 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes.js @@ -161,6 +161,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomized); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_aboutblank.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_aboutblank.js index 708a9f93db3a..1fd9ac215089 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_aboutblank.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_aboutblank.js @@ -164,6 +164,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_blob.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_blob.js index 65bd79205fe9..be7aedb174b6 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_blob.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_iframes_blob.js @@ -164,6 +164,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups.js index 40f972e38c95..b1b6f5e9d815 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups.js @@ -166,6 +166,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_aboutblank.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_aboutblank.js index 49d8bb53d8ce..5897aba7e541 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_aboutblank.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_aboutblank.js @@ -167,6 +167,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_blob.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_blob.js index fc2880986479..739aaf07b7f0 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_blob.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_blob.js @@ -158,6 +158,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_data.js b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_data.js index baa6b2e530e7..caca6e0ff97a 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_data.js +++ b/browser/components/resistfingerprinting/test/browser/browser_canvascompare_popups_data.js @@ -158,6 +158,11 @@ add_task( defaultsTest.bind(null, uri, testCanvasRandomization, expectedResults) ); +expectedResults = structuredClone(fppRandomizedSameDomain); +add_task( + defaultsPBMTest.bind(null, uri, testCanvasRandomization, expectedResults) +); + expectedResults = structuredClone(rfpFullyRandomized); add_task( simpleRFPTest.bind(null, uri, testCanvasRandomization, expectedResults) diff --git a/browser/components/resistfingerprinting/test/browser/head.js b/browser/components/resistfingerprinting/test/browser/head.js index 1d090e8a938d..18a96994c7a0 100644 --- a/browser/components/resistfingerprinting/test/browser/head.js +++ b/browser/components/resistfingerprinting/test/browser/head.js @@ -753,6 +753,30 @@ async function defaultsTest( } } +async function defaultsPBMTest( + uri, + testFunction, + expectedResults, + extraData, + extraPrefs +) { + if (extraData == undefined) { + extraData = {}; + } + extraData.private_window = true; + extraData.testDesc = extraData.testDesc || "default PBM window"; + expectedResults.shouldRFPApply = false; + if (extraPrefs != undefined) { + await SpecialPowers.pushPrefEnv({ + set: extraPrefs, + }); + } + await runActualTest(uri, testFunction, expectedResults, extraData); + if (extraPrefs != undefined) { + await SpecialPowers.popPrefEnv(); + } +} + async function simpleRFPTest( uri, testFunction,