Merge branch 'cherry-pick-98bf5baa-2' into '17-2-stable-ee'

Fix the vulnerability in the glm_source parameter

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4435



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gabriel Mazetto <gabriel@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>

app/controllers/concerns/preferred_language_switcher.rb

@@ -38,12 +38,12 @@ def browser_languages
   strong_memoize_attr :browser_languages
   def marketing_site_language
-    return [] unless params[:glm_source]
-    locale = params[:glm_source].scan(%r{(\w{2})-(\w{2})}).flatten
-
-    return [] if locale.empty?
+    # Our marketing site will be the only thing we are sure of the language placement in the url for.
+    locale = params[:glm_source]&.match(%r{\A#{ApplicationHelper.promo_host}/([a-z]{2})-([a-z]{2})}i)&.captures
+    return [] if locale.blank?
+    # This is local and then locale_region - the marketing site will always send locale-region pairs like fr-fr.
     [locale[0], "#{locale[0]}_#{locale[1]}"]
   end
 end

spec/controllers/concerns/preferred_language_switcher_spec.rb

@@ -40,6 +40,22 @@ def new
         expect(subject).to eq 'fr'
       end
+      context 'for case insensitivity on language' do
+        let(:glm_source) { 'about.gitlab.com/fr-FR/' }
+
+        it 'sets preferred_language accordingly' do
+          expect(subject).to eq 'fr'
+        end
+      end
+
+      context 'for case insensitivity on marketing site URL' do
+        let(:glm_source) { 'ABOUT.gitlab.com/fr-fr/' }
+
+        it 'sets preferred_language accordingly' do
+          expect(subject).to eq 'fr'
+        end
+      end
+
       context 'when language param is invalid' do
         let(:glm_source) { 'about.gitlab.com/ko-ko/' }
@@ -47,6 +63,14 @@ def new
           expect(subject).to eq Gitlab::CurrentSettings.default_preferred_language
         end
       end
+
+      context 'when the glm_source is not the marketing site' do
+        let(:glm_source) { 'some.othersite.com/fr-fr/' }
+
+        it 'sets preferred_language to default' do
+          expect(subject).to eq Gitlab::CurrentSettings.default_preferred_language
+        end
+      end
     end
     context 'when browser preferred language is not english' do