A platform for community discussion. Free, open, simple.
FIX: Require private message read scope for MCP drafts (#43944)
Natalie Tay15c63d06e428
diff --git a/lib/discourse_mcp/tools/drafts.rb b/lib/discourse_mcp/tools/drafts.rbindex f5feab79778..0ad406577df 100644--- a/lib/discourse_mcp/tools/drafts.rb+++ b/lib/discourse_mcp/tools/drafts.rb@@ -26,6 +26,12 @@ module DiscourseMcpreturn ToolHelpers.text_and_structured(draft_key:, found: false) if draft.blank?+ topic_id = draft_key.match(/\Atopic_(\d+)\z/)&.captures&.first+ if draft_key.start_with?(Draft::NEW_PRIVATE_MESSAGE) ||+ (topic_id && Topic.exists?(id: topic_id.to_i, archetype: Archetype.private_message))+ request_context.ensure_scopes!(Scopes::PRIVATE_MESSAGES_READ)+ end+parsed = JSON.parse(draft)parsed = {} if !parsed.is_a?(Hash)ToolHelpers.text_and_structured(diff --git a/spec/requests/mcp_content_access_spec.rb b/spec/requests/mcp_content_access_spec.rbindex 5e86bf1c7da..c5098d552c4 100644--- a/spec/requests/mcp_content_access_spec.rb+++ b/spec/requests/mcp_content_access_spec.rb@@ -248,6 +248,46 @@ describe "MCP content access" doendend+ it "requires private-message read scope for private-message drafts" do+ topic = Fabricate(:topic, user:)+ topic_draft_key = "topic_#{topic.id}"+ message_draft_key = "topic_#{message.topic_id}"+ compose_draft_key = "#{Draft::NEW_PRIVATE_MESSAGE}_#{Time.zone.now.to_i}"+ private_reply = "Private reply draft"+ private_title = "Private compose title"+ private_compose = "Private compose draft"+ Draft.set(user, topic_draft_key, 0, { reply: "Public topic draft" }.to_json)+ Draft.set(user, message_draft_key, 0, { reply: private_reply }.to_json)+ Draft.set(user, compose_draft_key, 0, { title: private_title, reply: private_compose }.to_json)+ authorize("mcp:drafts:read")++ call_tool("discourse_get_draft", { draft_key: topic_draft_key })+ expect(response.status).to eq(200)+ expect(response.parsed_body.dig("result", "structuredContent", "data", "reply")).to eq(+ "Public topic draft",+ )++ {+ message_draft_key => private_reply,+ compose_draft_key => private_compose,+ }.each do |draft_key, reply|+ call_tool("discourse_get_draft", { draft_key: })+ expect_missing_scope("mcp:private-messages:read")+ expect(response.body).not_to include(reply)+ end+ expect(response.body).not_to include(private_title)++ authorize("mcp:drafts:read", "mcp:private-messages:read")+ call_tool("discourse_get_draft", { draft_key: compose_draft_key })+ expect(response.status).to eq(200)+ expect(response.parsed_body.dig("result", "structuredContent", "data", "reply")).to eq(+ private_compose,+ )+ expect(response.parsed_body.dig("result", "structuredContent", "data", "title")).to eq(+ private_title,+ )+ end+it "requires the read scope for private-message resources and draft prompts" doauthorize{ "topic" => message.topic_id, "post" => message.id }.each do |type, id|