A platform for community discussion. Free, open, simple.
FIX: Restrict upcoming-changes toggle to registered upcoming-change settings (#42175)
Isaac Janzen1599c4512b15
diff --git a/app/services/upcoming_changes/toggle.rb b/app/services/upcoming_changes/toggle.rbindex 21e1e4f4032..b1606989d3c 100644--- a/app/services/upcoming_changes/toggle.rb+++ b/app/services/upcoming_changes/toggle.rb@@ -39,7 +39,7 @@ class UpcomingChanges::Toggleenddef setting_is_available(params:)- SiteSetting.respond_to?(params.setting_name)+ UpcomingChanges.exists?(params.setting_name)enddef toggle(params:, guardian:, options:)diff --git a/spec/requests/admin/config/upcoming_changes_controller_spec.rb b/spec/requests/admin/config/upcoming_changes_controller_spec.rbindex ddcc5ba803b..8dc894a9099 100644--- a/spec/requests/admin/config/upcoming_changes_controller_spec.rb+++ b/spec/requests/admin/config/upcoming_changes_controller_spec.rb@@ -187,6 +187,15 @@ RSpec.describe Admin::Config::UpcomingChangesController doenddescribe "#toggle_change" do+ before do+ mock_upcoming_change_metadata(+ enable_form_templates: {+ impact: "feature,all_members",+ status: :experimental,+ },+ )+ end+let(:setting_name) { "enable_form_templates" }context "when logged in as non-admin" do@@ -256,6 +265,23 @@ RSpec.describe Admin::Config::UpcomingChangesController doexpect(response.status).to eq(404)end++ it "rejects SiteSetting methods that are not upcoming changes" do+ messages =+ MessageBus.track_publish(SiteSettingExtension::SITE_SETTINGS_CHANNEL) do+ put "/admin/config/upcoming-changes/toggle.json",+ params: {+ setting_name: "notify_changed!",+ enabled: true,+ }+ end++ aggregate_failures do+ expect(response.status).to eq(404)+ expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))+ expect(messages).to be_empty+ end+ endendendenddiff --git a/spec/services/upcoming_changes/toggle_spec.rb b/spec/services/upcoming_changes/toggle_spec.rbindex 74bf4b4f858..1069c27283b 100644--- a/spec/services/upcoming_changes/toggle_spec.rb+++ b/spec/services/upcoming_changes/toggle_spec.rb@@ -9,6 +9,16 @@ RSpec.describe UpcomingChanges::Toggle dosubject(:result) { described_class.call(params:, **dependencies, options:) }fab!(:admin)++ before do+ mock_upcoming_change_metadata(+ enable_form_templates: {+ impact: "feature,all_members",+ status: :experimental,+ },+ )+ end+let(:params) { { setting_name:, enabled: } }let(:enabled) { true }let(:setting_name) { :enable_form_templates }@@ -28,6 +38,12 @@ RSpec.describe UpcomingChanges::Toggle doit { is_expected.to fail_a_policy(:setting_is_available) }end+ context "when setting_name is not an upcoming change" do+ let(:setting_name) { :notify_changed! }++ it { is_expected.to fail_a_policy(:setting_is_available) }+ end+context "when a non-admin user tries to change a setting" dolet(:guardian) { Guardian.new }