Do not strip subdomains when referrer trimming (duckduckgo#2053)

* Do not strip subdomains when referrer trimming * Update test specs * Bump reference-tests
Serenity355 · Jun 23, 2023 · 6be3e70 · 6be3e70
1 parent 625e1cb
commit 6be3e70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/shared/js/background/tracker-utils.js b/shared/js/background/tracker-utils.js
@@ -67,15 +67,9 @@ export function truncateReferrer (referrer, target) {
         return undefined
     }
 
-    let modifiedReferrer = referrer
-    if (isTracker(target) || (fromCname && isTracker(finalURL))) {
-        modifiedReferrer = utils.extractLimitedDomainFromURL(referrer, { keepSubdomains: false })
-    } else {
-        modifiedReferrer = utils.extractLimitedDomainFromURL(referrer, { keepSubdomains: true })
-    }
     // If extractLimitedDomainFromURL fails (for instance, invalid referrer URL), it
     // returns undefined, (in practice, don't modify the referrer), so sometimes this value could be undefined.
-    return modifiedReferrer
+    return utils.extractLimitedDomainFromURL(referrer, { keepSubdomains: true })
 }
 
 /**

diff --git a/unit-test/background/tracker-utils-tests.js b/unit-test/background/tracker-utils-tests.js
@@ -196,7 +196,7 @@ describe('Tracker Utilities', () => {
             name: 'target is a tracker, and referrer has a subdomain',
             referrer: 'http://subdomain.siteA.com/article/1',
             target: 'https://google-analytics.com/some/path',
-            expectedReferrer: 'http://sitea.com/'
+            expectedReferrer: 'http://subdomain.sitea.com/'
         },
         {
             name: 'target is not a tracker, referrer should keep subdomain',
@@ -244,7 +244,7 @@ describe('Tracker Utilities', () => {
             name: 'target is a tracker, referrer contains port',
             referrer: 'http://subdomain.siteA.com:4000/article/1',
             target: 'https://google-analytics.com/some/path',
-            expectedReferrer: 'http://sitea.com:4000/'
+            expectedReferrer: 'http://subdomain.sitea.com:4000/'
         },
         {
             name: 'target is a tracker, referrer is localhost',