A platform for community discussion. Free, open, simple.
FIX: Incorrect key lookup disables non-configurable plugin filtering in all_settings (#39943)
discourse-patch-triage[bot]9667012e0ea4
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rbindex b08505a305f..186f405922c 100644--- a/lib/site_setting_extension.rb+++ b/lib/site_setting_extension.rb@@ -375,7 +375,8 @@ module SiteSettingExtensiondefaults.all(default_locale).reject do |setting_name, _|- plugins[setting_name] && !Discourse.plugins_by_name[plugins[setting_name]].configurable?+ plugin_name = plugins[setting_name]+ plugin_name && !Discourse.plugins_by_name[plugin_name].configurable?end.select do |setting_name, _|is_hidden = current_hidden_settings.include?(setting_name)diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rbindex c7d75c049db..aae964e67f1 100644--- a/spec/requests/admin/site_settings_controller_spec.rb+++ b/spec/requests/admin/site_settings_controller_spec.rb@@ -27,6 +27,17 @@ RSpec.describe Admin::SiteSettingsController doresponse.parsed_body["site_settings"].find { |s| s["setting"] == "max_category_nesting" },).to be_nilend++ it "does not return settings from non-configurable plugins" do+ SiteSetting::SAMPLE_TEST_PLUGIN.stubs(:configurable?).returns(false)++ get "/admin/site_settings.json"++ expect(response.status).to eq(200)+ site_setting_names =+ response.parsed_body["site_settings"].map { |setting| setting["setting"] }+ expect(site_setting_names).not_to include("plugin_setting")+ endendshared_examples "site settings inaccessible" do