A platform for community discussion. Free, open, simple.
FIX: Reject API-key access to discourse-ai MCP OAuth start/callback GET routes (#45042)
Isaac Janzenc6e1e8fdbc40
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_mcp_servers_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_mcp_servers_controller.rbindex ee38abe6cb2..e89eb65a5b8 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_mcp_servers_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_mcp_servers_controller.rb@@ -6,6 +6,7 @@ module DiscourseAirequires_plugin PLUGIN_NAMEbefore_action :find_ai_mcp_server, only: %i[edit update destroy oauth_start oauth_disconnect]+ before_action :ensure_interactive_session, only: %i[oauth_start oauth_callback]skip_before_action :check_xhr, :preload_json, only: %i[oauth_start oauth_callback]def index@@ -166,6 +167,15 @@ module DiscourseAi@ai_mcp_server = AiMcpServer.find(params[:id])end+ # The OAuth start/callback actions are interactive, browser-driven redirect+ # flows that persist discovery state and replace the shared connection's+ # tokens. They must never be reachable via API keys (including read-only+ # scoped keys that are only permitted GET requests), which would otherwise+ # let a read-only key perform these writes.+ def ensure_interactive_session+ raise Discourse::InvalidAccess if is_api? || is_user_api?+ end+def ai_mcp_server_paramsparams.require(:ai_mcp_server).permit(:name,diff --git a/plugins/discourse-ai/spec/requests/admin/ai_mcp_servers_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_mcp_servers_controller_spec.rbindex f1563134a54..4966f9f92cf 100644--- a/plugins/discourse-ai/spec/requests/admin/ai_mcp_servers_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ai_mcp_servers_controller_spec.rb@@ -350,6 +350,39 @@ RSpec.describe DiscourseAi::Admin::AiMcpServersController doendend+ describe "read-only API key cannot invoke OAuth state mutations" do+ fab!(:ai_mcp_server) { Fabricate(:ai_mcp_server, auth_type: "oauth") }++ def readonly_headers+ api_key =+ Fabricate(:api_key, user: admin).tap do |key|+ ApiKeyScope.create!(api_key_id: key.id, resource: "global", action: "read")+ end+ { "Api-Key" => api_key.key, "Api-Username" => admin.username }+ end++ it "rejects oauth_start invoked with a read-only API key" do+ DiscourseAi::Mcp::OAuthFlow.stubs(:start!).returns("https://auth.example.com/authorize")++ get "/admin/plugins/discourse-ai/ai-mcp-servers/#{ai_mcp_server.id}/oauth/start.json",+ headers: readonly_headers++ expect(response.status).to eq(403)+ end++ it "rejects oauth_callback invoked with a read-only API key" do+ DiscourseAi::Mcp::OAuthFlow.stubs(:complete!).returns(ai_mcp_server)++ get "/admin/plugins/discourse-ai/ai-mcp-servers/oauth/callback.json",+ headers: readonly_headers,+ params: {+ state: "abc",+ }++ expect(response.status).to eq(403)+ end+ end+describe "DELETE #oauth_disconnect" dofab!(:ai_mcp_server) doFabricate(:ai_mcp_server, auth_type: "oauth", oauth_status: "connected")