From d91a605e48b4d4ac4e4f5b63745a485673c79b13 Mon Sep 17 00:00:00 2001
From: ffxbld <ffxbld@mozilla.com>
Date: Thu, 11 Apr 2024 11:40:46 +0000
Subject: [PATCH] No Bug, mozilla-esr115 repo-update remote-settings -
 a=repo-update r=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D207261
---
 .../dumps/blocklists/addons-bloomfilters.json | 193 +++++++++++++++++-
 .../dumps/main/search-telemetry-v2.json       |  55 ++++-
 .../dumps/security-state/intermediates.json   |  20 +-
 3 files changed, 237 insertions(+), 31 deletions(-)

diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json
index b8c3da728da46..ac0af3aaa740f 100644
--- a/services/settings/dumps/blocklists/addons-bloomfilters.json
+++ b/services/settings/dumps/blocklists/addons-bloomfilters.json
@@ -1,5 +1,196 @@
 {
   "data": [
+    {
+      "stash": {
+        "blocked": [
+          "ownsolution@admingrouphelper:0.5.2",
+          "firepocket@dev:2024.1.24.1",
+          "invited@admcm:0.3.0",
+          "analyzer@appsntricks:1.2",
+          "official@traveltab:1.3",
+          "goya@flowerbag:0.1.5",
+          "umanager@tsolutions:0.1.7",
+          "official@traveltab:1.2",
+          "prod@achelper:0.3.0",
+          "invited@admcm:0.1.1",
+          "beta@agmanager:0.1.6",
+          "init@gadmininit:0.1.0",
+          "private@lmaker:0.1.1",
+          "acmanager@final:0.1.4",
+          "ownsolution@admingrouphelper:0.1.0",
+          "beta@agmanager:0.4.0",
+          "corganizer@final:0.2.1",
+          "yourmove@official:0.1.0",
+          "prod@achelper:0.1.1",
+          "listener@notfarinc:1.0.0",
+          "fivestar@fivestarpocket:0.0.3",
+          "ownsolution@admingrouphelper:0.7.0",
+          "ownsolution@admingrouphelper:0.5.4",
+          "ownsolution@admingrouphelper:0.2.0",
+          "modearn@prod:2023.11.16",
+          "umanager@tsolutions:0.2.2",
+          "ownsolution@admingrouphelper:0.5.1",
+          "official@traveltab:1.4",
+          "prodocly@main:0.0.2",
+          "acmanager@final:0.1.2",
+          "holder@cholder:0.1.5",
+          "moreapp@moreappfinal:0.0.7",
+          "beta@agmanager:0.1.2",
+          "prod@achelper:0.1.6",
+          "corganizer@final:0.1.6",
+          "corganizer@final:0.2.2",
+          "private@lmaker:0.3.0",
+          "ownsolution@admingrouphelper:0.5.7",
+          "corganizer@final:0.1.7",
+          "smasters@dev:2023.11.10.1",
+          "beta@agmanager:0.1.0",
+          "private@lmaker:0.5.0",
+          "moreapp@moreappfinal:0.0.8",
+          "monschedule@dev:2024.1.17.1",
+          "holder@cholder:0.1.7",
+          "goya@flowerbag:0.1.0",
+          "acmanager@beta:0.0.4",
+          "invited@admcm:0.4.0",
+          "ownsolution@admingrouphelper:0.5.3",
+          "init@gadmininit:0.1.7",
+          "beta@agmanager:0.1.3",
+          "corganizer@final:0.2.4",
+          "goya@flowerbag:0.0.4",
+          "debug@angelcookie.app:0.2.1",
+          "analyzer@appsntricks:1.1",
+          "malzapp@official:0.0.1",
+          "holder@cholder:0.5.0",
+          "holder@cholder:0.6.0",
+          "prod@achelper:0.1.0",
+          "holder@cholder:0.1.2",
+          "holder@cholder:0.1.0",
+          "yourmove@official:0.0.7",
+          "ownsolution@admingrouphelper:0.5.5",
+          "fivestar@fivestarpocket:0.0.1",
+          "acmanager@final:0.1.0",
+          "umanager@tsolutions:0.2.3",
+          "dexhouse@official:2024.2.16.1",
+          "holder@cholder:0.3.0",
+          "userapproved@uasystem:0.0.1",
+          "ownsolution@admingrouphelper:0.4.0",
+          "private@lmaker:0.2.0",
+          "beta@agmanager:0.1.1",
+          "modearn@prod:2023.11.15",
+          "goya@flowerbag:0.1.4",
+          "goya@flowerbag:0.0.2",
+          "umanager@tsolutions:0.1.5",
+          "invited@admcm:0.2.0",
+          "yourmove@official:0.0.6",
+          "prod@achelper:0.4.0",
+          "goya@flowerbag:0.0.5",
+          "acmanager@beta:0.0.2",
+          "goya@flowerbag:0.0.1",
+          "private@lmaker:0.1.0",
+          "beta@agmanager:0.1.4",
+          "umanager@tsolutions:0.2.0",
+          "beta@agmanager:0.2.0",
+          "fivestar@fivestarpocket:0.0.4",
+          "moreapp@moreappfinal:0.0.3",
+          "beta@agmanager:0.3.0",
+          "goya@flowerbag:0.0.6",
+          "goya@flowerbag:0.0.3",
+          "init@gadmininit:0.2.0",
+          "vertez@prod:2024.2.28.1",
+          "ownsolution@admingrouphelper:0.5.6",
+          "smasters@dev:2023.11.13.0",
+          "userapproved@uasystem:0.0.2",
+          "userapproved@uasystem:0.0.5",
+          "corganizer@final:0.1.5",
+          "goya@flowerbag:0.1.3",
+          "frypray@systems:0.0.1",
+          "holder@cholder:0.1.6",
+          "ownsolution@admingrouphelper:0.6.0",
+          "official@traveltab:1.0",
+          "official@traveltab:1.1",
+          "init@gadmininit:0.4.0",
+          "userapproved@uasystem:0.0.6",
+          "corganizer@final:0.2.0",
+          "yourmove@official:0.0.1",
+          "userapproved@uasystem:0.0.4",
+          "ownsolution@admingrouphelper:0.8.0",
+          "ownsolution@admingrouphelper:0.5.0",
+          "umanager@tsolutions:0.1.0",
+          "goya@flowerbag:0.1.2",
+          "moreapp@moreappfinal:0.0.5",
+          "invited@admcm:0.1.8",
+          "private@lmaker:0.6.0",
+          "corganizer@final:0.1.0",
+          "yourmove@official:0.0.5",
+          "yourmove@official:0.0.2",
+          "prodocly@main:0.0.1",
+          "moreapp@moreappfinal:0.0.1",
+          "yourmove@official:0.0.8",
+          "moreapp@moreappfinal:0.0.2",
+          "goya@flowerbag:0.0.9",
+          "moreapp@moreappfinal:0.0.6",
+          "init@gadmininit:0.1.5",
+          "acmanager@beta:0.0.1",
+          "umanager@tsolutions:0.2.1",
+          "prod@achelper:0.1.5",
+          "beta@agmanager:0.1.7",
+          "yourmove@official:0.0.4",
+          "private@lmaker:0.4.0",
+          "goya@flowerbag:0.1.1",
+          "invited@admcm:0.1.0",
+          "acmanager@beta:0.0.3",
+          "holder@cholder:0.2.0",
+          "listener@notfarinc:1.0.1",
+          "userapproved@uasystem:0.0.3",
+          "goya@flowerbag:0.0.8",
+          "goya@flowerbag:0.0.7",
+          "invited@admcm:0.1.6",
+          "holder@cholder:0.4.0",
+          "holder@cholder:0.1.1",
+          "corganizer@final:0.2.3",
+          "init@gadmininit:0.1.6",
+          "acmanager@final:0.1.3",
+          "moreapp@moreappfinal:0.0.9",
+          "prod@achelper:0.2.0",
+          "ownsolution@admingrouphelper:0.3.0",
+          "prod@achelper:0.1.8",
+          "invited@admcm:0.1.7",
+          "userapproved@uasystem:0.0.7",
+          "beta@agmanager:0.1.5",
+          "yourmove@official:0.0.3",
+          "moreapp@moreappfinal:0.0.4",
+          "init@gadmininit:0.1.1",
+          "userapproved@uasystem:1.1.9",
+          "userapproved@uasystem:1.1.8",
+          "invited@admcm:0.1.5",
+          "bmttools@prod:0.0.1",
+          "analyzer@appsntricks:1.0",
+          "init@gadmininit:0.3.0",
+          "fivestar@fivestarpocket:0.0.2",
+          "umanager@tsolutions:0.1.6",
+          "prod@achelper:0.1.7"
+        ],
+        "unblocked": []
+      },
+      "schema": 1712744602348,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1712752505697,
+      "id": "8a549832-9ac4-4cfd-ab1b-190da763c3f4",
+      "last_modified": 1712752561961
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{bffa7976-db34-42e3-8d80-17acee672804}:19",
+          "{8858e73c-8617-402e-b57d-de5fcfdcd26a}:1.4"
+        ],
+        "unblocked": []
+      },
+      "schema": 1712342161525,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1712601304195,
+      "id": "6e3e7b5a-0bc5-43f1-87fd-96e397f0bbca",
+      "last_modified": 1712601358306
+    },
     {
       "stash": {
         "blocked": [
@@ -320,5 +511,5 @@
       "last_modified": 1707395854769
     }
   ],
-  "timestamp": 1712342161400
+  "timestamp": 1712752561961
 }
diff --git a/services/settings/dumps/main/search-telemetry-v2.json b/services/settings/dumps/main/search-telemetry-v2.json
index 1b0fdd4a053a5..9eb4e5d29ce6e 100644
--- a/services/settings/dumps/main/search-telemetry-v2.json
+++ b/services/settings/dumps/main/search-telemetry-v2.json
@@ -1,7 +1,7 @@
 {
   "data": [
     {
-      "schema": 1711474853858,
+      "schema": 1712582517430,
       "components": [
         {
           "type": "ad_carousel",
@@ -155,6 +155,20 @@
       "queryParamNames": [
         "q"
       ],
+      "domainExtraction": {
+        "ads": [
+          {
+            "method": "textContent",
+            "selectors": "#b_results .b_ad .b_attribution cite, .adsMvCarousel cite, aside cite"
+          }
+        ],
+        "nonAds": [
+          {
+            "method": "textContent",
+            "selectors": "#b_results .b_algo .b_attribution cite"
+          }
+        ]
+      },
       "searchPageRegexp": "^https://www\\.bing\\.com/search",
       "nonAdsLinkRegexps": [
         "^https://www.bing.com/ck/a"
@@ -163,10 +177,10 @@
         "^https://www\\.bing\\.com/acli?c?k"
       ],
       "id": "e1eec461-f1f3-40de-b94b-3b670b78108c",
-      "last_modified": 1711574102228
+      "last_modified": 1712762409389
     },
     {
-      "schema": 1711137332320,
+      "schema": 1712243919540,
       "components": [
         {
           "type": "ad_carousel",
@@ -185,6 +199,23 @@
             ]
           }
         },
+        {
+          "type": "ad_carousel",
+          "included": {
+            "parent": {
+              "selector": ".sh-sr__shop-result-group"
+            },
+            "related": {
+              "selector": "g-right-button, g-left-button"
+            },
+            "children": [
+              {
+                "selector": ".sh-np__click-target",
+                "countChildren": true
+              }
+            ]
+          }
+        },
         {
           "type": "refined_search_buttons",
           "topDown": true,
@@ -368,10 +399,6 @@
               "dataAttributeKey": "dtld"
             },
             "selectors": "[data-dtld]"
-          },
-          {
-            "method": "href",
-            "selectors": "a.x0Sesd"
           }
         ],
         "nonAds": [
@@ -388,8 +415,11 @@
             "selectors": "a[jsname='UWckNb']"
           },
           {
-            "method": "href",
-            "selectors": "a.iGVLpd"
+            "method": "dataAttribute",
+            "options": {
+              "dataAttributeKey": "lpage"
+            },
+            "selectors": "[data-id='mosaic'] [data-lpage]"
           }
         ]
       },
@@ -411,8 +441,11 @@
       "extraAdServersRegexps": [
         "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"
       ],
+      "nonAdsLinkQueryParamNames": [
+        "url"
+      ],
       "id": "635a3325-1995-42d6-be09-dbe4b2a95453",
-      "last_modified": 1711574102225
+      "last_modified": 1712582517281
     },
     {
       "isSPA": true,
@@ -752,5 +785,5 @@
       "last_modified": 1698666532324
     }
   ],
-  "timestamp": 1711574102228
+  "timestamp": 1712762409389
 }
diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json
index a7d46d8e4f9f4..ac343a24944d5 100644
--- a/services/settings/dumps/security-state/intermediates.json
+++ b/services/settings/dumps/security-state/intermediates.json
@@ -27720,24 +27720,6 @@
       "id": "35957622-8171-40c9-b5c6-f6630c77d128",
       "last_modified": 1601517444025
     },
-    {
-      "schema": 1601376747224,
-      "derHash": "uQ7q6THl4rfTNfFJ2mwiEJhgANIU/9tipy9zMtY3Ma8=",
-      "subject": "CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US",
-      "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBWZXJpem9uIEJ1c2luZXNzMREwDwYDVQQLEwhPbW5pUm9vdDEfMB0GA1UEAxMWVmVyaXpvbiBHbG9iYWwgUm9vdCBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "b2ff06177ee90557f82e4d2b65f87cbe3e37ef185fd9f5b2f7d8c654bf7eefbc",
-        "size": 1760,
-        "filename": "v-gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=.pem",
-        "location": "security-state-staging/intermediates/96d8b2a4-5c83-408a-aba1-f8c0818c74a1.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "v+gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=",
-      "crlite_enrolled": false,
-      "id": "90eff404-0514-42a4-b6bc-375d060840d8",
-      "last_modified": 1601517443892
-    },
     {
       "schema": 1601376768762,
       "derHash": "bay7iUUTex2tQhGwQ2774G8SrONpBJc7Ra4ldAgj02k=",
@@ -30619,5 +30601,5 @@
       "last_modified": 1559865884636
     }
   ],
-  "timestamp": 1712311023721
+  "timestamp": 1712674623155
 }
-- 
GitLab