From d2852627dc652f1f5f8efd6c6488e8490b2c8062 Mon Sep 17 00:00:00 2001 From: Rendijs Smukulis Date: Thu, 26 Sep 2024 15:49:43 +0300 Subject: [PATCH 1/2] Added a test that validates that, when Tracker is defined for a eTLD+2 domain (e.g. bad.etld-plus-two.site), tracker requests are correctly Ignored --- .../domain_matching_tests.json | 9 +++++++- .../tracker_radar_reference.json | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json b/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json index 6186e11..c25155d 100644 --- a/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json +++ b/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json @@ -33,6 +33,13 @@ "requestURL": "https://ignore.test/", "requestType": "script", "expectAction": "ignore" + }, + { + "name": "same party ignore with deeper subdomain", + "siteURL": "https://bad.etld-plus-two.site/", + "requestURL": "https://bad.etld-plus-two.site/script.js", + "requestType": "script", + "expectAction": "ignore" }, { "name": "tracker loads ignore", @@ -1077,7 +1084,7 @@ "expectAction": "redirect", "expectRedirect": "data:application/javascript;base64,KGZ1bmN0aW9uKCkge3dpbmRvdy5zdXJyb2dhdGUxPXRydWV9KSgpOw==", "expectExpression": "window.surrogate1 === true" - } + } ] } } diff --git a/tracker-radar-tests/TR-domain-matching/tracker_radar_reference.json b/tracker-radar-tests/TR-domain-matching/tracker_radar_reference.json index 9a831c9..aff7c77 100644 --- a/tracker-radar-tests/TR-domain-matching/tracker_radar_reference.json +++ b/tracker-radar-tests/TR-domain-matching/tracker_radar_reference.json @@ -255,6 +255,21 @@ "rules": [], "default": "ignore" }, + "bad.etld-plus-two.site": { + "domain": "bad.etld-plus-two.site", + "owner": { + "name": "Test Site for Tracker Blocking With eTLD+2", + "displayName": "Bad Third Party Site eTLD+2", + "privacyPolicy": "", + "url": "http://bad.etld-plus-two.site" + }, + "prevalence": 0.1, + "fingerprinting": 3, + "cookies": 0.1, + "categories": [], + "default": "block", + "rules": [] + }, "tracker.test": { "domain": "tracker.test", "owner": { @@ -819,6 +834,13 @@ "prevalence": 0.1, "displayName": "Test Site for Tracker Blocking" }, + "Test Site for Tracker Blocking With eTLD+2": { + "domains": [ + "bad.etld-plus-two.site" + ], + "prevalence": 0.1, + "displayName": "Bad Third Party Site eTLD+2" + }, "Tests for formatting": { "domains": [ "format.test" @@ -876,6 +898,7 @@ "bad.third-party.site": "Test Site for Tracker Blocking", "sometimes-bad.third-party.site": "Test Site for Tracker Blocking", "broken.third-party.site": "Test Site for Tracker Blocking", + "bad.etld-plus-two.site": "Test Site for Tracker Blocking With eTLD+2", "format.test": "Tests for formatting", "third-party.site": "Test Site for Tracker Blocking", "tracker.test": "Test Site for Tracker Blocking", From bf520bd780b32107de60c86504cf6a0b03a44c18 Mon Sep 17 00:00:00 2001 From: Rendijs Smukulis Date: Wed, 9 Oct 2024 09:39:38 +0300 Subject: [PATCH 2/2] Fixed whitespaces --- .../TR-domain-matching/domain_matching_tests.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json b/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json index c25155d..22b32af 100644 --- a/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json +++ b/tracker-radar-tests/TR-domain-matching/domain_matching_tests.json @@ -33,7 +33,7 @@ "requestURL": "https://ignore.test/", "requestType": "script", "expectAction": "ignore" - }, + }, { "name": "same party ignore with deeper subdomain", "siteURL": "https://bad.etld-plus-two.site/", @@ -1084,7 +1084,7 @@ "expectAction": "redirect", "expectRedirect": "data:application/javascript;base64,KGZ1bmN0aW9uKCkge3dpbmRvdy5zdXJyb2dhdGUxPXRydWV9KSgpOw==", "expectExpression": "window.surrogate1 === true" - } + } ] } }