A platform for community discussion. Free, open, simple.
DEV: use explicit permit instead of permit! for provider_params (#38632)
Isaac Janzena76557700cec
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_embeddings_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_embeddings_controller.rbindex fbe0bb5d34c..8c0951f4369 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_embeddings_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_embeddings_controller.rb@@ -142,7 +142,7 @@ module DiscourseAiparams.dig(:ai_embedding, :provider_params)&.slice(*extra_field_names.keys)if received_prov_params.present?- permitted[:provider_params] = received_prov_params.permit!+ permitted[:provider_params] = received_prov_params.permit(*extra_field_names.keys)endenddiff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_llms_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_llms_controller.rbindex 64926e7cfe2..a8fa776fd8d 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_llms_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_llms_controller.rb@@ -248,7 +248,7 @@ module DiscourseAisanitize_dependent_params!(received_prov_params, extra_field_names)- permitted[:provider_params] = received_prov_params.permit!+ permitted[:provider_params] = received_prov_params.permit(*extra_field_names.keys)endenddiff --git a/plugins/discourse-ai/spec/requests/admin/ai_llms_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_llms_controller_spec.rbindex 4e54c6cb63c..5d7844c8a66 100644--- a/plugins/discourse-ai/spec/requests/admin/ai_llms_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ai_llms_controller_spec.rb@@ -206,6 +206,19 @@ RSpec.describe DiscourseAi::Admin::AiLlmsController do)end+ it "does not store nested hash values in provider_params" do+ provider_params = { organization: { nested: "injected_value" } }++ post "/admin/plugins/discourse-ai/ai-llms.json",+ params: {+ ai_llm: valid_attrs.merge(provider_params: provider_params),+ }++ expect(response.status).to eq(201)+ created_model = LlmModel.last+ expect(created_model.lookup_custom_param("organization")).not_to be_a(Hash)+ end+it "ignores parameters not associated with that provider" doprovider_params = { access_key_id: "random_key" }