diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-08-29 16:19:08 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-08-29 16:19:08 +0000 |
| commit | 7163b5b06b385d4908d93a1f916a15b1eb113323 (patch) | |
| tree | 46d9baeab2c3ab91bca249c446b822b5dd956531 | |
| parent | e6869b8f6c5a589cc9807e2a797599fb7a4a968e (diff) | |
| parent | 72390953da802311180f53b6a646d80bc1da2849 (diff) | |
| download | gitlab-ce-7163b5b06b385d4908d93a1f916a15b1eb113323.tar.gz | |
Merge branch 'handle-invalid-mirror-url' into 'master'
Handle invalid mirror url
See merge request gitlab-org/gitlab-ce!32353
| -rw-r--r-- | app/models/remote_mirror.rb | 1 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_mirror_repos.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/handle-invalid-mirror-url.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/models/remote_mirror_spec.rb | 7 |
5 files changed, 17 insertions, 1 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index c9ee0653d86..41e63986286 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -200,6 +200,7 @@ class RemoteMirror < ApplicationRecord result.password = '*****' if result.password result.user = '*****' if result.user && result.user != 'git' # tokens or other data may be saved as user result.to_s + rescue URI::Error end def ensure_remote! diff --git a/app/views/projects/mirrors/_mirror_repos.html.haml b/app/views/projects/mirrors/_mirror_repos.html.haml index 6f8a93fbcf5..84f0900d9c1 100644 --- a/app/views/projects/mirrors/_mirror_repos.html.haml +++ b/app/views/projects/mirrors/_mirror_repos.html.haml @@ -50,7 +50,7 @@ - @project.remote_mirrors.each_with_index do |mirror, index| - next if mirror.new_record? %tr.qa-mirrored-repository-row.rspec-mirrored-repository-row{ class: ('bg-secondary' if mirror.disabled?) } - %td.qa-mirror-repository-url= mirror.safe_url + %td.qa-mirror-repository-url= mirror.safe_url || _('Invalid URL') %td= _('Push') %td = mirror.last_update_started_at.present? ? time_ago_with_tooltip(mirror.last_update_started_at) : _('Never') diff --git a/changelogs/unreleased/handle-invalid-mirror-url.yml b/changelogs/unreleased/handle-invalid-mirror-url.yml new file mode 100644 index 00000000000..c72707a2cad --- /dev/null +++ b/changelogs/unreleased/handle-invalid-mirror-url.yml @@ -0,0 +1,5 @@ +--- +title: Handle invalid mirror url +merge_request: 32353 +author: Lee Tickett +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 12138d2db3a..51e00d6e0d2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6110,6 +6110,9 @@ msgstr "" msgid "Invalid Login or password" msgstr "" +msgid "Invalid URL" +msgstr "" + msgid "Invalid date" msgstr "" diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb index 7edeb56efe2..f8d6e500e10 100644 --- a/spec/models/remote_mirror_spec.rb +++ b/spec/models/remote_mirror_spec.rb @@ -40,6 +40,13 @@ describe RemoteMirror, :mailer do expect(remote_mirror).to be_invalid expect(remote_mirror.errors[:url].first).to include('Requests to the local network are not allowed') end + + it 'returns a nil safe_url' do + remote_mirror = build(:remote_mirror, url: 'http://[0:0:0:0:ffff:123.123.123.123]/foo.git') + + expect(remote_mirror.url).to eq('http://[0:0:0:0:ffff:123.123.123.123]/foo.git') + expect(remote_mirror.safe_url).to be_nil + end end end |