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

Merge branch '49272-sanitize-git-url-in-import-errors' into 'master' 

Resolve "Credentails used for repository import are visible inside the Sidekiq logs (Background Jobs)"

See merge request gitlab-org/gitlab-ce!20641
This commit is contained in:
Rémy Coutable 2018-07-23 10:19:16 +00:00
parent cc540bb2a2 d32802c76b
commit 1917aa984d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/projects/import_service.rb
View File

@ -25,7 +25,7 @@ module Projects
success
rescue => e
error("Error importing repository #{project.import_url} into #{project.full_path} - #{e.message}")
error("Error importing repository #{project.safe_import_url} into #{project.full_path} - #{e.message}")
end
private

5
changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Sanitize git URL in import errors
merge_request:
author: Jamie Schembri
type: fixed

4
spec/services/projects/import_service_spec.rb
View File

@ -69,7 +69,7 @@ describe Projects::ImportService do
result = subject.execute
expect(result[:status]).to eq :error
expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - The repository could not be created."
expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - The repository could not be created."
end
context 'when repository creation succeeds' do
@ -141,7 +141,7 @@ describe Projects::ImportService do
result = subject.execute
expect(result[:status]).to eq :error
expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - Failed to import the repository"
expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - Failed to import the repository"
end
context 'when repository import scheduled' do