Merge branch 'john-mason-fix-21001' into 'master'

Strip whitespace from search parameters

See merge request gitlab-org/gitlab!71328

app/controllers/search_controller.rb

@@ -12,6 +12,7 @@ class SearchController < ApplicationController
   around_action :allow_gitaly_ref_name_caching
 
   before_action :block_anonymous_global_searches, :check_scope_global_search_enabled, except: :opensearch
+  before_action :strip_surrounding_whitespace_from_search, except: :opensearch
   skip_before_action :authenticate_user!
   requires_cross_project_access if: -> do
     search_term_present = params[:search].present? || params[:term].present?
@@ -197,6 +198,10 @@ class SearchController < ApplicationController
   def count_action_name?
     action_name.to_sym == :count
   end
+
+  def strip_surrounding_whitespace_from_search
+    %i(term search).each { |param| params[param]&.strip! }
+  end
 end
 
 SearchController.prepend_mod_with('SearchController')

spec/controllers/search_controller_spec.rb

@@ -215,6 +215,16 @@ RSpec.describe SearchController do
         end
       end
 
+      it 'strips surrounding whitespace from search query' do
+        get :show, params: { scope: 'notes', search: '   foobar    ' }
+        expect(assigns[:search_term]).to eq 'foobar'
+      end
+
+      it 'strips surrounding whitespace from autocomplete term' do
+        expect(controller).to receive(:search_autocomplete_opts).with('youcompleteme')
+        get :autocomplete, params: { term: '   youcompleteme    ' }
+      end
+
       it 'finds issue comments' do
         project = create(:project, :public)
         note = create(:note_on_issue, project: project)