Merge branch 'sd5869/344960/urlencode_elasticsearch_credentials' into 'master'

Urlencode the Elasticsearch Credentials

See merge request gitlab-org/gitlab!75450

ee/app/models/ee/application_setting.rb

@@ -316,8 +316,8 @@ module EE
       elasticsearch_url.map do |url|
         uri = URI.parse(url)
 
-        uri.user = elasticsearch_username
-        uri.password = elasticsearch_password.presence || ''
+        uri.user = URI.encode_www_form_component(elasticsearch_username)
+        uri.password = URI.encode_www_form_component(elasticsearch_password)
         uri.to_s
       end
     end

ee/spec/models/application_setting_spec.rb

@@ -374,6 +374,17 @@ RSpec.describe ApplicationSetting do
 
       expect(setting.elasticsearch_url_with_credentials).to eq(%w[http://username:password@example.com https://test:test@example2.com:9200])
     end
+
+    it 'encodes the credentials' do
+      setting.elasticsearch_url = 'http://username:password@example.com,https://test:test@example2.com:9200'
+      setting.elasticsearch_username = 'foo/admin'
+      setting.elasticsearch_password = 'b@r'
+
+      expect(setting.elasticsearch_url_with_credentials).to eq(%w[
+        http://foo%2Fadmin:b%40r@example.com
+        https://foo%2Fadmin:b%40r@example2.com:9200
+      ])
+    end
   end
 
   describe '#elasticsearch_password' do