kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Properly handle colons in URL passwords

Closes #49080

See merge request gitlab-org/gitlab-ce!20538
This commit is contained in:
James Lopez 2018-07-11 06:00:17 +00:00
commit c6b670216c
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/sh-handle-colons-in-url-passwords.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Properly handle colons in URL passwords
merge_request:
author:
type: fixed

2
lib/gitlab/url_sanitizer.rb
View file

@ -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

1
spec/lib/gitlab/url_sanitizer_spec.rb
View file

@ -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 }