Implement viewer query param removal experiment.

ampproject · Oct 21, 2019 · 4b579f6 · 4b579f6
1 parent 89a048d
commit 4b579f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/service/navigation.js b/src/service/navigation.js
@@ -30,6 +30,7 @@ import {
   installServiceInEmbedScope,
   registerServiceBuilderForDoc,
 } from '../service';
+import {isExperimentOn} from '../experiments';
 import {toWin} from '../types';
 import PriorityQueue from '../utils/priority-queue';
 
@@ -549,6 +550,25 @@ export class Navigation {
           element.setAttribute('target', '_blank');
         }
       }
+
+      // Safari 13: Remove viewer's query params (e.g. amp_js_v, usqp) to prevent
+      // Document.referrer from being reduced to eTLD+1 (e.g. ampproject.org).
+      const platform = Services.platformFor(this.ampdoc.win);
+      const viewer = Services.viewerForDoc(element);
+      if (
+        isExperimentOn(
+          this.ampdoc.win,
+          'remove-viewer-query-params-on-navigate'
+        ) &&
+        location.search &&
+        platform.isSafari() &&
+        platform.getMajorVersion() >= 13 &&
+        viewer.isProxyOrigin() &&
+        viewer.isEmbedded()
+      ) {
+        const noSearch = `${location.origin}${location.pathname}${location.hash}`;
+        this.ampdoc.win.history.replaceState({}, '', noSearch);
+      }
     }
   }
 

diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js
@@ -373,6 +373,12 @@ const EXPERIMENTS = [
     spec: 'https://github.com/ampproject/amphtml/issues/24168',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/24169',
   },
+  {
+    id: 'remove-viewer-query-params-on-navigate',
+    name: 'Removes query params from viewer iframe on navigation.',
+    spec: 'https://github.com/ampproject/amphtml/issues/25179',
+    cleanupIssue: 'https://github.com/ampproject/amphtml/issues/24169',
+  },
 ];
 
 if (getMode().localDev) {