Commit 02de8b26 authored by ffxbld's avatar ffxbld
Browse files

No Bug, mozilla-esr102 repo-update HSTS HPKP remote-settings - a=repo-update 

Differential Revision: https://phabricator.services.mozilla.com/D166043
parent a531735e

security/manager/ssl/StaticHPKPins.h

+1 −1
Original line number Diff line number Diff line
@@ -1095,4 +1095,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { 


static const int32_t kUnknownId = -1;



static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1681126083982000);
 
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1681385208135000);

security/manager/ssl/nsSTSPreloadList.inc

+191 −281

File changed.

Preview size limit exceeded, changes collapsed.

services/settings/dumps/main/search-config.json

+140 −187
Original line number Diff line number Diff line 
{

  "data": [

    {

      "params": {

        "searchUrlGetParams": [

          {

            "name": "tn",

            "value": "monline_7_dg"

          },

          {

            "name": "ie",

            "value": "utf-8"

          },

          {

            "name": "wd",

            "value": "{searchTerms}"

          }

        ],

        "suggestUrlGetParams": [

          {

            "name": "tn",

            "value": "monline_7_dg"

          },

          {

            "name": "ie",

            "value": "utf-8"

          },

          {

            "name": "action",

            "value": "opensearch"

          },

          {

            "name": "wd",

            "value": "{searchTerms}"

          }

        ]

      },

      "schema": 1670360576036,

      "appliesTo": [

        {

          "params": {

            "searchUrlGetParams": [

              {

                "name": "ie",

                "value": "utf-8"

              },

              {

                "name": "wd",

                "value": "{searchTerms}"

              }

            ],

            "suggestUrlGetParams": [

              {

                "name": "tn",

                "value": "monline_4_dg"

              },

              {

                "name": "ie",

                "value": "utf-8"

              },

              {

                "name": "action",

                "value": "opensearch"

              },

              {

                "name": "wd",

                "value": "{searchTerms}"

              }

            ]

          },

          "default": "yes",

          "override": true,

          "orderHint": 3000,

          "application": {

            "distributions": [

              "MozillaOnline"

            ]

          },

          "extraParams": [

            {

              "name": "tn",

              "value": "monline_4_dg",

              "purpose": "searchbar",

              "condition": "purpose"

            },

            {

              "name": "tn",

              "value": "monline_3_dg",

              "purpose": "homepage",

              "condition": "purpose"

            },

            {

              "name": "tn",

              "value": "monline_3_dg",

              "purpose": "newtab",

              "condition": "purpose"

            }

          ]

        },

        {

          "included": {

            "locales": {

              "matches": [

                "zh-CN"

              ]

            }

          }

        },

        {

          "default": "yes",

          "included": {

            "locales": {

              "matches": [

                "zh-CN"

              ]

            },

            "regions": [

              "cn"

            ]

          }

        },

        {

          "default": "no",

          "override": true,

          "application": {

            "distributions": [

              "acer-001",

              "acer-002",

              "acer-g-003",

              "acer-003",

              "acer-004"

            ]

          }

        }

      ],

      "telemetryId": "baidu",

      "webExtension": {

        "id": "baidu@search.mozilla.org"

      },

      "id": "52dd490a-89e8-45f2-96b0-f2c72e157526",

      "last_modified": 1671479975574

    },

    {

      "params": {

        "searchUrlGetParams": [
@@ -153,7 +13,7 @@ 
          }

        ]

      },

      "schema": 1671122204682,

      "schema": 1672351882248,

      "appliesTo": [

        {

          "included": {
@@ -414,55 +274,11 @@ 
          },

          "application": {

            "distributions": [

              "acer-001",

              "acer-002",

              "acer-g-003",

              "acer-003",

              "acer-004"

            ]

          }

        },

        {

          "params": {

            "searchUrlGetParams": [

              {

                "name": "pc",

                "value": "MOZD"

              },

              {

                "name": "q",

                "value": "{searchTerms}"

              }

            ]

          },

          "override": true,

          "application": {

            "distributions": [

              "acer-001",

              "acer-002"

            ]

          }

        },

        {

          "params": {

            "searchUrlGetParams": [

              {

                "name": "pc",

                "value": "MOZE"

              },

              {

                "name": "q",

                "value": "{searchTerms}"

              }

            ]

          },

          "override": true,

          "application": {

            "distributions": [

              "acer-g-003"

            ]

          }

        },

        {

          "params": {

            "searchUrlGetParams": [
@@ -587,7 +403,144 @@ 
        "id": "bing@search.mozilla.org"

      },

      "id": "7ec766f6-639a-4618-91bc-33eb3d4378c6",

      "last_modified": 1671479975571

      "last_modified": 1672778333687

    },

    {

      "params": {

        "searchUrlGetParams": [

          {

            "name": "tn",

            "value": "monline_7_dg"

          },

          {

            "name": "ie",

            "value": "utf-8"

          },

          {

            "name": "wd",

            "value": "{searchTerms}"

          }

        ],

        "suggestUrlGetParams": [

          {

            "name": "tn",

            "value": "monline_7_dg"

          },

          {

            "name": "ie",

            "value": "utf-8"

          },

          {

            "name": "action",

            "value": "opensearch"

          },

          {

            "name": "wd",

            "value": "{searchTerms}"

          }

        ]

      },

      "schema": 1672159002777,

      "appliesTo": [

        {

          "params": {

            "searchUrlGetParams": [

              {

                "name": "ie",

                "value": "utf-8"

              },

              {

                "name": "wd",

                "value": "{searchTerms}"

              }

            ],

            "suggestUrlGetParams": [

              {

                "name": "tn",

                "value": "monline_4_dg"

              },

              {

                "name": "ie",

                "value": "utf-8"

              },

              {

                "name": "action",

                "value": "opensearch"

              },

              {

                "name": "wd",

                "value": "{searchTerms}"

              }

            ]

          },

          "default": "yes",

          "override": true,

          "orderHint": 3000,

          "application": {

            "distributions": [

              "MozillaOnline"

            ]

          },

          "extraParams": [

            {

              "name": "tn",

              "value": "monline_4_dg",

              "purpose": "searchbar",

              "condition": "purpose"

            },

            {

              "name": "tn",

              "value": "monline_3_dg",

              "purpose": "homepage",

              "condition": "purpose"

            },

            {

              "name": "tn",

              "value": "monline_3_dg",

              "purpose": "newtab",

              "condition": "purpose"

            }

          ]

        },

        {

          "included": {

            "locales": {

              "matches": [

                "zh-CN"

              ]

            }

          }

        },

        {

          "default": "yes",

          "included": {

            "locales": {

              "matches": [

                "zh-CN"

              ]

            },

            "regions": [

              "cn"

            ]

          }

        },

        {

          "default": "no",

          "override": true,

          "application": {

            "distributions": [

              "acer-003",

              "acer-004"

            ]

          }

        }

      ],

      "telemetryId": "baidu",

      "webExtension": {

        "id": "baidu@search.mozilla.org"

      },

      "id": "52dd490a-89e8-45f2-96b0-f2c72e157526",

      "last_modified": 1672778333684

    },

    {

      "params": {
@@ -3029,5 +2982,5 @@ 
      "last_modified": 1583937832210

    }

  ],

  "timestamp": 1671479975574

  "timestamp": 1672778333687

}

services/settings/dumps/main/search-telemetry-v2.json

+48 −45
Original line number Diff line number Diff line 
{

  "data": [

    {

      "schema": 1672245404849,

      "taggedCodes": [

        "firefox-a",

        "firefox-b",

        "firefox-b-1",

        "firefox-b-ab",

        "firefox-b-1-ab",

        "firefox-b-d",

        "firefox-b-1-d",

        "firefox-b-e",

        "firefox-b-1-e",

        "firefox-b-m",

        "firefox-b-1-m",

        "firefox-b-o",

        "firefox-b-1-o",

        "firefox-b-lm",

        "firefox-b-1-lm",

        "firefox-b-lg",

        "firefox-b-huawei-h1611",

        "firefox-b-is-oem1",

        "firefox-b-oem1",

        "firefox-b-oem2",

        "firefox-b-tinno",

        "firefox-b-pn-wt",

        "firefox-b-pn-wt-us",

        "ubuntu"

      ],

      "telemetryId": "google",

      "organicCodes": [],

      "codeParamName": "client",

      "queryParamName": "q",

      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",

      "adServerAttributes": [

        "rw"

      ],

      "followOnParamNames": [

        "oq",

        "ved",

        "ei"

      ],

      "extraAdServersRegexps": [

        "^https://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"

      ],

      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",

      "last_modified": 1672778125399

    },

    {

      "schema": 1671479978127,

      "taggedCodes": [
@@ -102,50 +149,6 @@ 
      "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca",

      "last_modified": 1661199890666

    },

    {

      "schema": 1643100256547,

      "taggedCodes": [

        "firefox-a",

        "firefox-b",

        "firefox-b-1",

        "firefox-b-ab",

        "firefox-b-1-ab",

        "firefox-b-d",

        "firefox-b-1-d",

        "firefox-b-e",

        "firefox-b-1-e",

        "firefox-b-m",

        "firefox-b-1-m",

        "firefox-b-o",

        "firefox-b-1-o",

        "firefox-b-lm",

        "firefox-b-1-lm",

        "firefox-b-lg",

        "firefox-b-huawei-h1611",

        "firefox-b-is-oem1",

        "firefox-b-oem1",

        "firefox-b-oem2",

        "firefox-b-tinno",

        "firefox-b-pn-wt",

        "firefox-b-pn-wt-us",

        "ubuntu"

      ],

      "telemetryId": "google",

      "organicCodes": [],

      "codeParamName": "client",

      "queryParamName": "q",

      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",

      "followOnParamNames": [

        "oq",

        "ved",

        "ei"

      ],

      "extraAdServersRegexps": [

        "^https://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"

      ],

      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",

      "last_modified": 1643136933998

    },

    {

      "schema": 1643107838909,

      "taggedCodes": [
@@ -169,5 +172,5 @@ 
      "last_modified": 1643136933989

    }

  ],

  "timestamp": 1671565418576

  "timestamp": 1672778125399

}