Merge branch 'fix_import_credentials' into 'master'

Fix credentials detection for UrlSanitizer

See merge request gitlab-org/gitlab!83444

lib/gitlab/url_sanitizer.rb

@@ -71,7 +71,10 @@ module Gitlab
         url.sub!("#{raw_credentials}@", '')
 
         user, _, password = raw_credentials.partition(':')
-        @credentials ||= { user: user.presence, password: password.presence }
+
+        @credentials ||= {}
+        @credentials[:user] = user.presence if @credentials[:user].blank?
+        @credentials[:password] = password.presence if @credentials[:password].blank?
       end
 
       url = Addressable::URI.parse(url)

spec/controllers/concerns/import_url_params_spec.rb

@@ -55,4 +55,22 @@ RSpec.describe ImportUrlParams do
       end
     end
   end
+
+  context 'url with provided mixed credentials' do
+    let(:params) do
+      ActionController::Parameters.new(project: {
+        import_url: 'https://user@url.com',
+        import_url_user: '', import_url_password: 'password'
+      })
+    end
+
+    describe '#import_url_params' do
+      it 'returns import_url built from both url and hash credentials' do
+        expect(import_url_params).to eq(
+          import_url: 'https://user:password@url.com',
+          import_type: 'git'
+        )
+      end
+    end
+  end
 end

spec/lib/gitlab/url_sanitizer_spec.rb

@@ -139,6 +139,23 @@ RSpec.describe Gitlab::UrlSanitizer do
         it { is_expected.to eq(credentials) }
       end
     end
+
+    context 'with mixed credentials' do
+      where(:url, :credentials, :result) do
+        'http://a@example.com'   | { password: 'd' } | { user: 'a', password: 'd' }
+        'http://a:b@example.com' | { password: 'd' } | { user: 'a', password: 'd' }
+        'http://:b@example.com'  | { password: 'd' } | { user: nil, password: 'd' }
+        'http://a@example.com'   | { user: 'c' }     | { user: 'c', password: nil }
+        'http://a:b@example.com' | { user: 'c' }     | { user: 'c', password: 'b' }
+        'http://a:b@example.com' | { user: '' }      | { user: 'a', password: 'b' }
+      end
+
+      with_them do
+        subject { described_class.new(url, credentials: credentials).credentials }
+
+        it { is_expected.to eq(result) }
+      end
+    end
   end
 
   describe '#user' do