A platform for community discussion. Free, open, simple.
SECURITY: Unscoped status lookups leak restricted metadata
Sam Saffronc0f6e9a90380
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/ai_credits_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/ai_credits_controller.rbindex 930008e0290..bfbb0d02599 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/ai_credits_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/ai_credits_controller.rb@@ -8,7 +8,7 @@ module DiscourseAiCREDIT_STATUS_CACHE_TTL = 5.secondsdef status- CreditStatusChecker.call(params: status_params) do |result|+ CreditStatusChecker.call(params: status_params, guardian: guardian) do |result|on_success doexpires_in CREDIT_STATUS_CACHE_TTL, public: falserender json: {diff --git a/plugins/discourse-ai/app/services/discourse_ai/credit_status_checker.rb b/plugins/discourse-ai/app/services/discourse_ai/credit_status_checker.rbindex b686fa98936..fd10208b806 100644--- a/plugins/discourse-ai/app/services/discourse_ai/credit_status_checker.rb+++ b/plugins/discourse-ai/app/services/discourse_ai/credit_status_checker.rb@@ -28,12 +28,16 @@ module DiscourseAiprivate- def check_agents(params:)+ def check_agents(params:, guardian:)context[:agents] = {}return true if params.agent_ids.blank?- # Batch load agents- agents = AiAgent.where(id: params.agent_ids).to_a+ # Batch load agents scoped to enabled and user-accessible+ agents =+ AiAgent+ .where(id: params.agent_ids, enabled: true)+ .to_a+ .select { |a| guardian.user.in_any_groups?(a.allowed_group_ids) }# Collect all LLM model IDs neededllm_model_ids =@@ -100,9 +104,10 @@ module DiscourseAitrueend- def check_llm_models(params:)+ def check_llm_models(params:, guardian:)context[:llm_models] = {}return true if params.llm_model_ids.blank?+ return true unless guardian.is_staff?# Batch load LLM models with their credit allocations and daily usagellm_models =diff --git a/plugins/discourse-ai/spec/requests/ai_credits_controller_spec.rb b/plugins/discourse-ai/spec/requests/ai_credits_controller_spec.rbindex 331420952c6..50b8adefb3e 100644--- a/plugins/discourse-ai/spec/requests/ai_credits_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/ai_credits_controller_spec.rb@@ -60,7 +60,12 @@ RSpec.describe DiscourseAi::AiCreditsController doit "handles mixed valid and invalid IDs" dollm_model = Fabricate(:llm_model, id: -10)- ai_agent = Fabricate(:ai_agent, default_llm_id: llm_model.id)+ ai_agent =+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )Fabricate(:llm_credit_allocation, llm_model: llm_model, daily_credits: 1000)get "/discourse-ai/credits/status.json", params: { agent_ids: [ai_agent.id, 99_999] }@@ -72,7 +77,13 @@ RSpec.describe DiscourseAi::AiCreditsController docontext "with agent_ids param" dofab!(:llm_model) { Fabricate(:llm_model, id: -1) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endit "returns empty for agent without credit allocation" doget "/discourse-ai/credits/status.json", params: { agent_ids: [ai_agent.id] }@@ -112,12 +123,36 @@ RSpec.describe DiscourseAi::AiCreditsController doexpect(agent_data["credit_status"]["hard_limit_reached"]).to eq(true)expect(agent_data["credit_status"]["credits_remaining"]).to eq(0)end++ it "excludes disabled agents" do+ ai_agent.update!(enabled: false)++ get "/discourse-ai/credits/status.json", params: { agent_ids: [ai_agent.id] }++ expect(response.status).to eq(200)+ expect(response.parsed_body["agents"]).to eq({})+ end++ it "excludes agents the user does not have group access to" do+ ai_agent.update!(allowed_group_ids: [Group::AUTO_GROUPS[:staff]])++ get "/discourse-ai/credits/status.json", params: { agent_ids: [ai_agent.id] }++ expect(response.status).to eq(200)+ expect(response.parsed_body["agents"]).to eq({})+ endendendcontext "with features param" dofab!(:llm_model) { Fabricate(:llm_model, id: -2) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endbefore doSiteSetting.ai_discover_enabled = true@@ -164,7 +199,13 @@ RSpec.describe DiscourseAi::AiCreditsController docontext "with both agent_ids and features params" dofab!(:llm_model) { Fabricate(:llm_model, id: -3) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endfab!(:llm_credit_allocation) doFabricate(:llm_credit_allocation, llm_model: llm_model, daily_credits: 1000)end@@ -188,8 +229,21 @@ RSpec.describe DiscourseAi::AiCreditsController doendcontext "with llm_model_ids param" do+ fab!(:admin)fab!(:llm_model) { Fabricate(:llm_model, id: -100) }+ before { sign_in(admin) }++ it "returns empty for non-staff users" do+ sign_in(user)++ Fabricate(:llm_credit_allocation, llm_model: llm_model, daily_credits: 1000)+ get "/discourse-ai/credits/status.json", params: { llm_model_ids: [llm_model.id] }++ expect(response.status).to eq(200)+ expect(response.parsed_body["llm_models"]).to eq({})+ end+it "returns empty for model without credit allocation" doget "/discourse-ai/credits/status.json", params: { llm_model_ids: [llm_model.id] }diff --git a/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb b/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rbindex 7977189c894..409e03da0d5 100644--- a/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb+++ b/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb@@ -4,8 +4,10 @@ RSpec.describe DiscourseAi::CreditStatusChecker do# Contract validations are tested through the service call tests belowdescribe ".call" do- subject(:result) { described_class.call(params:) }+ subject(:result) { described_class.call(params:, guardian:) }+ fab!(:user)+ let(:guardian) { Guardian.new(user) }let(:params) { {} }context "when no parameters provided" do@@ -26,7 +28,13 @@ RSpec.describe DiscourseAi::CreditStatusChecker docontext "with agent_ids param" dofab!(:llm_model) { Fabricate(:llm_model, id: -1) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endlet(:params) { { agent_ids: [ai_agent.id] } }@@ -73,8 +81,25 @@ RSpec.describe DiscourseAi::CreditStatusChecker doexpect(agent_data[:credit_status][:hard_limit_reached]).to eq(true)end+ it "excludes disabled agents" do+ ai_agent.update!(enabled: false)++ expect(result[:agents]).to eq({})+ end++ it "excludes agents the user does not have group access to" do+ ai_agent.update!(allowed_group_ids: [Group::AUTO_GROUPS[:staff]])++ expect(result[:agents]).to eq({})+ end+it "batch loads multiple agents efficiently" do- agent2 = Fabricate(:ai_agent, default_llm_id: llm_model.id)+ agent2 =+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )params[:agent_ids] = [ai_agent.id, agent2.id]queries = track_sql_queries { result }@@ -94,7 +119,13 @@ RSpec.describe DiscourseAi::CreditStatusChecker docontext "with features param" dofab!(:llm_model) { Fabricate(:llm_model, id: -2) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endlet(:params) { { features: ["discoveries"] } }@@ -148,10 +179,18 @@ RSpec.describe DiscourseAi::CreditStatusChecker doendcontext "with llm_model_ids param" do+ fab!(:admin)fab!(:llm_model) { Fabricate(:llm_model, id: -3) }+ let(:guardian) { Guardian.new(admin) }let(:params) { { llm_model_ids: [llm_model.id] } }+ it "returns empty for non-staff users" do+ non_staff_result = described_class.call(params:, guardian: Guardian.new(user))++ expect(non_staff_result[:llm_models]).to eq({})+ end+context "without credit allocation" doit { is_expected.to run_successfully }@@ -217,12 +256,20 @@ RSpec.describe DiscourseAi::CreditStatusChecker doendcontext "with combined parameters" do+ fab!(:admin)fab!(:llm_model) { Fabricate(:llm_model, id: -6) }- fab!(:ai_agent) { Fabricate(:ai_agent, default_llm_id: llm_model.id) }+ fab!(:ai_agent) do+ Fabricate(+ :ai_agent,+ default_llm_id: llm_model.id,+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ )+ endfab!(:llm_credit_allocation) doFabricate(:llm_credit_allocation, llm_model: llm_model, daily_credits: 1000)end+ let(:guardian) { Guardian.new(admin) }let(:params) do{ agent_ids: [ai_agent.id], features: ["discoveries"], llm_model_ids: [llm_model.id] }end@@ -256,11 +303,14 @@ RSpec.describe DiscourseAi::CreditStatusChecker doendit "removes duplicates from input" do+ admin = Fabricate(:admin)llm_model = Fabricate(:llm_model, id: -7)Fabricate(:llm_credit_allocation, llm_model: llm_model, daily_credits: 1000)params[:llm_model_ids] = [llm_model.id, llm_model.id, llm_model.id]- expect(result[:llm_models].keys.length).to eq(1)+ staff_result = described_class.call(params:, guardian: Guardian.new(admin))++ expect(staff_result[:llm_models].keys.length).to eq(1)endendend