Skip to content

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

FIX: Respect `chat_search_enabled` in chat search API (#44124)

Gabriel Grubbac355408ca1ac
diff --git a/plugins/chat/app/controllers/chat/api/search_controller.rb b/plugins/chat/app/controllers/chat/api/search_controller.rb
index a5179ac3693..312a8fcd64f 100644
--- a/plugins/chat/app/controllers/chat/api/search_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/search_controller.rb
@@ -2,6 +2,8 @@
class Chat::Api::SearchController < Chat::ApiController
def index
+ raise Discourse::NotFound unless SiteSetting.chat_search_enabled
+
Chat::SearchMessage.call(service_params) do
on_success do |messages:, metadata:|
render json: {
diff --git a/plugins/chat/spec/requests/chat/api/search_controller_spec.rb b/plugins/chat/spec/requests/chat/api/search_controller_spec.rb
index 81d384a0fd7..6a4f7f27736 100644
--- a/plugins/chat/spec/requests/chat/api/search_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/search_controller_spec.rb
@@ -32,6 +32,52 @@ RSpec.describe Chat::Api::SearchController do
end
end
+ context "when chat search is disabled" do
+ fab!(:indexed_message) do
+ Fabricate(:chat_message, chat_channel: channel, message: "searchable chat message")
+ end
+
+ before do
+ SiteSetting.chat_search_enabled = true
+ SearchIndexer.enable
+ SearchIndexer.index(indexed_message)
+ end
+
+ after { SearchIndexer.disable }
+
+ it "blocks global and channel-scoped searches" do
+ get "/chat/api/search.json", params: { query: "searchable chat message" }
+
+ expect(response.status).to eq(200)
+ expect(response.body).to include(indexed_message.message)
+
+ get "/chat/api/search.json",
+ params: {
+ query: "searchable chat message",
+ channel_id: channel.id,
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.body).to include(indexed_message.message)
+
+ SiteSetting.chat_search_enabled = false
+
+ get "/chat/api/search.json", params: { query: "searchable chat message" }
+
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(indexed_message.message)
+
+ get "/chat/api/search.json",
+ params: {
+ query: "searchable chat message",
+ channel_id: channel.id,
+ }
+
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(indexed_message.message)
+ end
+ end
+
context "when query is missing" do
it "returns a 400" do
get "/chat/api/search.json", params: {}