Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'

Fixes project denial of service via gitmodules using Extended ASCII.

Closes #34259

See merge request gitlab-org/gitlab-ce!14301

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb
index c4f4e0d21dc..5a2e4b34069 100644
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
@@ -147,6 +147,12 @@ describe SubmoduleHelper do
         expect(helper.submodule_links(submodule_item)).to eq([nil, nil])
       end
 
+      it 'sanitizes invalid URL with extended ASCII' do
+        stub_url('é')
+
+        expect(helper.submodule_links(submodule_item)).to eq([nil, nil])
+      end
+
       it 'returns original' do
         stub_url('http://mygitserver.com/gitlab-org/gitlab-ce')
         expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil])