Skip to content

A platform for community discussion. Free, open, simple.

FIX: Support MCP OAuth when login is required (#44096)

Penar Musaraj211a65e4faba
diff --git a/app/controllers/mcp_controller.rb b/app/controllers/mcp_controller.rb
index cb74c772875..f8562d4a079 100644
--- a/app/controllers/mcp_controller.rb
+++ b/app/controllers/mcp_controller.rb
@@ -1,7 +1,10 @@
# frozen_string_literal: true
class McpController < ApplicationController
- skip_before_action :check_xhr, :preload_json, :verify_authenticity_token
+ skip_before_action :check_xhr,
+ :preload_json,
+ :verify_authenticity_token,
+ :redirect_to_login_if_required
before_action :ensure_mcp_enabled
before_action :validate_origin
diff --git a/app/controllers/mcp_oauth_metadata_controller.rb b/app/controllers/mcp_oauth_metadata_controller.rb
index 1fa61179655..5242d1fb2be 100644
--- a/app/controllers/mcp_oauth_metadata_controller.rb
+++ b/app/controllers/mcp_oauth_metadata_controller.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class McpOauthMetadataController < ApplicationController
- skip_before_action :check_xhr, :preload_json
+ skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
before_action :ensure_mcp_enabled
def protected_resource
diff --git a/app/controllers/mcp_oauth_tokens_controller.rb b/app/controllers/mcp_oauth_tokens_controller.rb
index db40cd509f6..fdc49fec402 100644
--- a/app/controllers/mcp_oauth_tokens_controller.rb
+++ b/app/controllers/mcp_oauth_tokens_controller.rb
@@ -3,7 +3,10 @@
class McpOauthTokensController < ApplicationController
OAUTH_PARAMETERS = %w[code refresh_token token code_verifier].freeze
- skip_before_action :check_xhr, :preload_json, :verify_authenticity_token
+ skip_before_action :check_xhr,
+ :preload_json,
+ :verify_authenticity_token,
+ :redirect_to_login_if_required
before_action :validate_request_format
def create
diff --git a/spec/requests/mcp_content_access_spec.rb b/spec/requests/mcp_content_access_spec.rb
index 705267e4cc8..39d0dc54069 100644
--- a/spec/requests/mcp_content_access_spec.rb
+++ b/spec/requests/mcp_content_access_spec.rb
@@ -590,6 +590,7 @@ describe "MCP content access" do
end
it "preserves content access and allows private-message access only with its scopes" do
+ SiteSetting.login_required = true
public_post = Fabricate(:post, user:)
unrelated_message = Fabricate(:private_message_post)
authorize
diff --git a/spec/requests/mcp_controller_spec.rb b/spec/requests/mcp_controller_spec.rb
index 445a7c0bf12..d3028c97acf 100644
--- a/spec/requests/mcp_controller_spec.rb
+++ b/spec/requests/mcp_controller_spec.rb
@@ -78,6 +78,69 @@ describe "MCP transport" do
McpPrimitive.create!(kind: "tool", identifier: "discourse_current_user_get", enabled: true)
end
+ context "when login is required" do
+ before { SiteSetting.login_required = true }
+
+ it "lists tools using a bearer token without a browser session" do
+ list_payload = payload.merge(method: "tools/list", params: payload[:params].slice(:_meta))
+ list_headers = headers.except("HTTP_MCP_NAME").merge("HTTP_MCP_METHOD" => "tools/list")
+
+ post "/mcp", params: list_payload.to_json, headers: list_headers
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("result", "tools").pluck("name")).to contain_exactly(
+ "discourse_current_user_get",
+ )
+ end
+
+ it "calls tools using a bearer token without a browser session" do
+ post "/mcp", params: payload.to_json, headers: headers
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("result", "structuredContent", "username")).to eq(
+ admin.username,
+ )
+ end
+
+ it "challenges requests without a bearer token even with a browser session" do
+ sign_in(admin)
+
+ post "/mcp", params: payload.to_json, headers: headers.except("HTTP_AUTHORIZATION")
+
+ expect(response.status).to eq(401)
+ expect(response.headers["WWW-Authenticate"]).to eq(
+ %(Bearer resource_metadata="#{DiscourseMcp.protected_resource_metadata_url}"),
+ )
+ end
+
+ it "challenges anonymous requests without a bearer token" do
+ post "/mcp", params: payload.to_json, headers: headers.except("HTTP_AUTHORIZATION")
+
+ expect(response.status).to eq(401)
+ expect(response.headers["WWW-Authenticate"]).to eq(
+ %(Bearer resource_metadata="#{DiscourseMcp.protected_resource_metadata_url}"),
+ )
+ end
+
+ it "rejects invalid bearer tokens" do
+ post "/mcp",
+ params: payload.to_json,
+ headers: headers.merge("HTTP_AUTHORIZATION" => "Bearer invalid")
+
+ expect(response.status).to eq(401)
+ expect(response.headers["WWW-Authenticate"]).to include('error="invalid_token"')
+ end
+
+ it "returns not found when MCP is disabled" do
+ access_token
+ SiteSetting.mcp_server_enabled = false
+
+ post "/mcp", params: payload.to_json, headers: headers
+
+ expect(response.status).to eq(404)
+ end
+ end
+
it "directs unauthenticated clients to resource metadata for scope selection" do
post "/mcp", params: payload.to_json, headers: headers.except("HTTP_AUTHORIZATION")
@@ -98,6 +161,7 @@ describe "MCP transport" do
end
it "returns an OAuth insufficient-scope challenge for an exposed tool" do
+ SiteSetting.login_required = true
McpPrimitive.create!(kind: "tool", identifier: "discourse_read_post", enabled: true)
scoped_payload =
payload.deep_merge(
diff --git a/spec/requests/mcp_oauth_authorizations_controller_spec.rb b/spec/requests/mcp_oauth_authorizations_controller_spec.rb
index e1170522c37..7da03f73d39 100644
--- a/spec/requests/mcp_oauth_authorizations_controller_spec.rb
+++ b/spec/requests/mcp_oauth_authorizations_controller_spec.rb
@@ -8,6 +8,7 @@ describe McpOauthAuthorizationsController do
describe "#show" do
it "redirects anonymous users to login and preserves the authorization request" do
+ SiteSetting.login_required = true
client =
McpOauthClient.create!(
client_id: "login-client",
@@ -45,6 +46,8 @@ describe McpOauthAuthorizationsController do
describe "#create" do
it "rejects anonymous consent submissions" do
+ SiteSetting.login_required = true
+
post "/oauth2/mcp/authorize", params: { decision: "approve" }
expect(response.status).to eq(403)
diff --git a/spec/requests/mcp_oauth_metadata_controller_spec.rb b/spec/requests/mcp_oauth_metadata_controller_spec.rb
index f8c08313677..f8a2cc9e81c 100644
--- a/spec/requests/mcp_oauth_metadata_controller_spec.rb
+++ b/spec/requests/mcp_oauth_metadata_controller_spec.rb
@@ -3,6 +3,31 @@
describe McpOauthMetadataController do
before { SiteSetting.mcp_server_enabled = true }
+ %w[
+ /.well-known/oauth-protected-resource/mcp
+ /.well-known/oauth-authorization-server
+ /.well-known/openid-configuration
+ ].each do |endpoint|
+ context "when login is required for #{endpoint}" do
+ before { SiteSetting.login_required = true }
+
+ it "returns discovery metadata without a browser session" do
+ get endpoint, headers: { "Accept" => "application/json" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["scopes_supported"]).to eq(DiscourseMcp.registry.scopes)
+ end
+
+ it "returns not found when MCP is disabled" do
+ SiteSetting.mcp_server_enabled = false
+
+ get endpoint, headers: { "Accept" => "application/json" }
+
+ expect(response.status).to eq(404)
+ end
+ end
+ end
+
it "advertises every registered scope in protected resource metadata" do
get "/.well-known/oauth-protected-resource/mcp"
diff --git a/spec/requests/mcp_oauth_tokens_controller_spec.rb b/spec/requests/mcp_oauth_tokens_controller_spec.rb
index 637c17ab143..75326a6cbb8 100644
--- a/spec/requests/mcp_oauth_tokens_controller_spec.rb
+++ b/spec/requests/mcp_oauth_tokens_controller_spec.rb
@@ -31,6 +31,75 @@ describe McpOauthTokensController do
end
describe "#create" do
+ context "when login is required" do
+ before { SiteSetting.login_required = true }
+
+ it "exchanges an authorization code without a browser session" do
+ code =
+ McpOauthAuthorizationCode.issue!(
+ authorization:,
+ redirect_uri: client.redirect_uris.first,
+ resource: DiscourseMcp.resource_url,
+ code_challenge: challenge,
+ )
+
+ post "/oauth2/mcp/token",
+ params: {
+ grant_type: "authorization_code",
+ code:,
+ client_id: client.client_id,
+ redirect_uri: client.redirect_uris.first,
+ code_verifier: verifier,
+ resource: DiscourseMcp.resource_url,
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body).to include(
+ "access_token" => be_present,
+ "refresh_token" => be_present,
+ "token_type" => "Bearer",
+ "scope" => "mcp:profile:read",
+ )
+ expect(response.headers["Cache-Control"]).to include("no-store")
+ end
+
+ it "refreshes tokens without a browser session" do
+ refresh_token, = McpOauthRefreshToken.issue!(authorization:)
+
+ post "/oauth2/mcp/token",
+ params: {
+ grant_type: "refresh_token",
+ refresh_token:,
+ client_id: client.client_id,
+ resource: DiscourseMcp.resource_url,
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body).to include(
+ "access_token" => be_present,
+ "refresh_token" => be_present,
+ "token_type" => "Bearer",
+ "scope" => "mcp:profile:read",
+ )
+ expect(response.parsed_body["refresh_token"]).not_to eq(refresh_token)
+ end
+
+ it "rejects invalid authorization codes" do
+ post "/oauth2/mcp/token",
+ params: {
+ grant_type: "authorization_code",
+ code: "invalid",
+ client_id: client.client_id,
+ redirect_uri: client.redirect_uris.first,
+ code_verifier: verifier,
+ resource: DiscourseMcp.resource_url,
+ }
+
+ expect(response.status).to eq(400)
+ expect(response.parsed_body).to eq("error" => "invalid_grant")
+ end
+ end
+
it "returns invalid_grant when the authorization no longer exists" do
code =
McpOauthAuthorizationCode.issue!(
@@ -55,4 +124,17 @@ describe McpOauthTokensController do
expect(response.parsed_body).to eq("error" => "invalid_grant")
end
end
+
+ describe "#revoke" do
+ it "revokes tokens without a browser session when login is required" do
+ SiteSetting.login_required = true
+ token = McpOauthAccessToken.issue!(authorization:)
+ token_record = McpOauthAccessToken.find_by!(token_hash: McpOauthAccessToken.digest(token))
+
+ post "/oauth2/mcp/revoke", params: { token: }
+
+ expect(response.status).to eq(200)
+ expect(token_record.reload.revoked_at).to be_present
+ end
+ end
end