diff --git a/toolkit/components/featuregates/Features.toml b/toolkit/components/featuregates/Features.toml index e7d97d49c2c3..9ef2b0224df6 100644 --- a/toolkit/components/featuregates/Features.toml +++ b/toolkit/components/featuregates/Features.toml @@ -7,4 +7,4 @@ restart-required = false type = "boolean" bug-numbers = [1519276] is-public = true -default-value = false \ No newline at end of file +default-value = true diff --git a/toolkit/components/normandy/docs/index.rst b/toolkit/components/normandy/docs/index.rst index 0173042175b6..8007a818d728 100644 --- a/toolkit/components/normandy/docs/index.rst +++ b/toolkit/components/normandy/docs/index.rst @@ -6,11 +6,22 @@ Shield Recipe Client Normandy (aka the Shield Recipe Client) is a targeted change control system, allowing small changes to be made within a release of Firefox, -such as studies. It downloads recipes and actions from the `recipe -server`_, verifies their cryptographic signatures, and then executes -them. +such as studies. + +It downloads recipes and actions from :ref:`Remote Settings ` +and then executes them. + +.. note:: + + Originally, the recipes were fetched from the `recipe server`_, but in `Bug 1513854`_ + the source was changed to *Remote Settings*. The cryptographic signatures are verified + at the *Remote Settings* level (integrity) and at the *Normandy* level + (authenticity of publisher). + + The source can still be controlled by :ref:`Feature Gates `. .. _recipe server: https://github.com/mozilla/normandy/ +.. _Bug 1513854: https://bugzilla.mozilla.org/show_bug.cgi?id=1513854 .. toctree:: :maxdepth: 1 diff --git a/toolkit/components/normandy/test/browser/browser_RecipeRunner.js b/toolkit/components/normandy/test/browser/browser_RecipeRunner.js index 7d0757060ffb..14e3942830b8 100644 --- a/toolkit/components/normandy/test/browser/browser_RecipeRunner.js +++ b/toolkit/components/normandy/test/browser/browser_RecipeRunner.js @@ -128,6 +128,11 @@ decorate_task( ); decorate_task( + withPrefEnv({ + set: [ + ["features.normandy-remote-settings.enabled", false], + ], + }), withStub(Uptake, "reportRunner"), withStub(NormandyApi, "fetchRecipes"), withStub(ActionsManager.prototype, "runRecipe"), @@ -258,6 +263,11 @@ decorate_task( ); decorate_task( + withPrefEnv({ + set: [ + ["features.normandy-remote-settings.enabled", false], + ], + }), withMockNormandyApi, async function testRunFetchFail(mockApi) { const reportRunner = sinon.stub(Uptake, "reportRunner");