From a0c25878134c968f126dfe9dc18de62b0479f038 Mon Sep 17 00:00:00 2001
From: Thomas Wisniewski <twisniewski@mozilla.com>
Date: Tue, 6 Jul 2021 19:59:33 +0000
Subject: [PATCH] Bug 1713693 - Add a SmartBlock shim for Doubleclick;
 r=denschub,webcompat-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D119099
---
 browser/extensions/webcompat/data/shims.js    | 41 +++++++++++++++++++
 browser/extensions/webcompat/manifest.json    |  8 +++-
 browser/extensions/webcompat/moz.build        |  4 ++
 .../extensions/webcompat/shims/empty-shim.txt |  0
 browser/extensions/webcompat/shims/vast2.xml  | 12 ++++++
 browser/extensions/webcompat/shims/vast3.xml  | 12 ++++++
 browser/extensions/webcompat/shims/vmad.xml   | 12 ++++++
 browser/installer/allowed-dupes.mn            |  3 ++
 8 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 browser/extensions/webcompat/shims/empty-shim.txt
 create mode 100644 browser/extensions/webcompat/shims/vast2.xml
 create mode 100644 browser/extensions/webcompat/shims/vast3.xml
 create mode 100644 browser/extensions/webcompat/shims/vmad.xml

diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js
index 0a554bcfcdcd..fcbf7c1f1d59 100644
--- a/browser/extensions/webcompat/data/shims.js
+++ b/browser/extensions/webcompat/data/shims.js
@@ -134,6 +134,47 @@ const AVAILABLE_SHIMS = [
     matches: ["*://auth.9c9media.ca/auth/main.js"],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "Doubleclick",
+    platform: "all",
+    name: "Doubleclick",
+    bug: "1713693",
+    matches: [
+      {
+        patterns: [
+          "*://securepubads.g.doubleclick.net/gampad/*ad-blk*",
+          "*://pubads.g.doubleclick.net/gampad/*ad-blk*",
+        ],
+        target: "empty-shim.txt",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+      {
+        patterns: [
+          "*://securepubads.g.doubleclick.net/gampad/*xml_vmap1*",
+          "*://pubads.g.doubleclick.net/gampad/*xml_vmap1*",
+        ],
+        target: "vmad.xml",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+      {
+        patterns: [
+          "*://securepubads.g.doubleclick.net/gampad/*xml_vmap2*",
+          "*://pubads.g.doubleclick.net/gampad/*xml_vmap2*",
+        ],
+        target: "vast2.xml",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+      {
+        patterns: [
+          "*://securepubads.g.doubleclick.net/gampad/*ad*",
+          "*://pubads.g.doubleclick.net/gampad/*ad*",
+        ],
+        target: "vast3.xml",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+    ],
+    onlyIfBlockedByETP: true,
+  },
   {
     id: "Eluminate",
     platform: "all",
diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json
index 52e61aed5e21..c26113ae341d 100644
--- a/browser/extensions/webcompat/manifest.json
+++ b/browser/extensions/webcompat/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "23.6.0",
+  "version": "23.7.0",
 
   "applications": {
     "gecko": {
@@ -94,6 +94,7 @@
     "shims/bmauth.js",
     "shims/eluminate.js",
     "shims/empty-script.js",
+    "shims/empty-shim.txt",
     "shims/facebook-sdk.js",
     "shims/facebook.svg",
     "shims/google-analytics-and-tag-manager.js",
@@ -107,6 +108,9 @@
     "shims/play.svg",
     "shims/rambler-authenticator.js",
     "shims/rich-relevance.js",
-    "shims/tracking-pixel.png"
+    "shims/tracking-pixel.png",
+    "shims/vast2.xml",
+    "shims/vast3.xml",
+    "shims/vmad.xml"
   ]
 }
diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build
index e936701c5a20..742e94e07e5d 100644
--- a/browser/extensions/webcompat/moz.build
+++ b/browser/extensions/webcompat/moz.build
@@ -81,6 +81,7 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
     "shims/bmauth.js",
     "shims/eluminate.js",
     "shims/empty-script.js",
+    "shims/empty-shim.txt",
     "shims/facebook-sdk.js",
     "shims/facebook.svg",
     "shims/google-analytics-and-tag-manager.js",
@@ -95,6 +96,9 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
     "shims/rambler-authenticator.js",
     "shims/rich-relevance.js",
     "shims/tracking-pixel.png",
+    "shims/vast2.xml",
+    "shims/vast3.xml",
+    "shims/vmad.xml",
 ]
 
 FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [
diff --git a/browser/extensions/webcompat/shims/empty-shim.txt b/browser/extensions/webcompat/shims/empty-shim.txt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/browser/extensions/webcompat/shims/vast2.xml b/browser/extensions/webcompat/shims/vast2.xml
new file mode 100644
index 000000000000..3536ccfc0f47
--- /dev/null
+++ b/browser/extensions/webcompat/shims/vast2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  Bug 1713693 - Shim Doubleclick
+
+  Some sites rely on an XML VAST Ad response from Doubleclick, or will
+  break (showing black boxes instead of videos, etc). This shim mitigates
+  such breakage.
+-->
+<VAST version="2.0"></VAST>
diff --git a/browser/extensions/webcompat/shims/vast3.xml b/browser/extensions/webcompat/shims/vast3.xml
new file mode 100644
index 000000000000..ae03f0dc14e4
--- /dev/null
+++ b/browser/extensions/webcompat/shims/vast3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  Bug 1713693 - Shim Doubleclick
+
+  Some sites rely on an XML VAST Ad response from Doubleclick, or will
+  break (showing black boxes instead of videos, etc). This shim mitigates
+  such breakage.
+-->
+<VAST version="3.0"></VAST>
diff --git a/browser/extensions/webcompat/shims/vmad.xml b/browser/extensions/webcompat/shims/vmad.xml
new file mode 100644
index 000000000000..5bb9a5a5d519
--- /dev/null
+++ b/browser/extensions/webcompat/shims/vmad.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  Bug 1713693 - Shim Doubleclick
+
+  Some sites rely on an XML VMAD Ad response from Doubleclick, or will
+  break (showing black boxes instead of videos, etc). This shim mitigates
+  such breakage.
+-->
+<vmap:AdBreak></vmap:AdBreak>
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index b76091d593fe..44839c068d38 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -66,6 +66,9 @@ browser/defaults/settings/main/password-rules.json
 browser/defaults/settings/main/search-default-override-allowlist.json
 browser/defaults/settings/main/url-classifier-skip-urls.json
 
+# Bug 1713693 - empty-shim.txt, an intentionally blank file used by SmartBlock (0 bytes)
+browser/features/webcompat@mozilla.org/shims/empty-shim.txt
+
 #ifdef MOZ_EME_WIN32_ARTIFACT
 gmp-clearkey/0.1/manifest.json
 i686/gmp-clearkey/0.1/manifest.json