Skip to content

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

FIX: correctly reject invalid searches (#45092)

Sam5e159a40f5cb
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 567a1919477..588e7355572 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -260,6 +260,10 @@ class SearchController < ApplicationController
return if params[:skip_context] == "true"
search_context = params[:search_context]
+ if search_context && !search_context.is_a?(ActionController::Parameters)
+ raise Discourse::InvalidParameters.new(:search_context)
+ end
+
unless search_context
if (context = params[:context]) && (id = params[:context_id])
search_context = { type: context, id: id, name: id }
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 601f4aaf1b2..c7366398f8f 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -801,6 +801,18 @@ RSpec.describe SearchController do
end
context "with search context" do
+ it "returns a 400 for a string search context on full-page search" do
+ get "/search.json", params: { q: "test", search_context: "user" }
+
+ expect(response.status).to eq(400)
+ end
+
+ it "returns a 400 for a string search context on search queries" do
+ get "/search/query.json", params: { term: "test", search_context: "user" }
+
+ expect(response.status).to eq(400)
+ end
+
it "raises an error with an invalid context type" do
get "/search/query.json",
params: {