Merge branch 'sh-handle-colons-in-url-passwords' into 'master'

Properly handle colons in URL passwords

Closes #49080

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

changelogs/unreleased/sh-handle-colons-in-url-passwords.yml

+---
+title: Properly handle colons in URL passwords
+merge_request:
+author:
+type: fixed

lib/gitlab/url_sanitizer.rb

@@ -58,7 +58,7 @@ module Gitlab
       if raw_credentials.present?
         url.sub!("#{raw_credentials}@", '')
-        user, password = raw_credentials.split(':')
+        user, _, password = raw_credentials.partition(':')
         @credentials ||= { user: user.presence, password: password.presence }
       end

spec/lib/gitlab/url_sanitizer_spec.rb

@@ -92,6 +92,7 @@ describe Gitlab::UrlSanitizer do
     context 'credentials in URL' do
       where(:url, :credentials) do
         'http://foo:bar@example.com' | { user: 'foo', password: 'bar' }
+        'http://foo:bar:baz@example.com' | { user: 'foo', password: 'bar:baz' }
         'http://:bar@example.com'    | { user: nil,   password: 'bar' }
         'http://foo:@example.com'    | { user: 'foo', password: nil }
         'http://foo@example.com'     | { user: 'foo', password: nil }