diff options
author | Rubén Dávila <rdavila84@gmail.com> | 2016-05-18 21:16:36 -0500 |
---|---|---|
committer | Rubén Dávila <rdavila84@gmail.com> | 2016-05-18 21:16:36 -0500 |
commit | 0c47b68d0474b595bb03a49ce755c96f5d00fbf1 (patch) | |
tree | 3c5b4dc75958ad40960cde6f4967fc375222d826 /app | |
parent | 28eea9bdfd0b28ad044f76bd4fcf988329ca9921 (diff) | |
download | gitlab-ce-0c47b68d0474b595bb03a49ce755c96f5d00fbf1.tar.gz |
Mask credentials from URL when import of project has failed.
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project.rb | 4 | ||||
-rw-r--r-- | app/workers/repository_import_worker.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a3c4f1d8e9b..b464335597d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -376,14 +376,14 @@ class Project < ActiveRecord::Base end def import_url=(value) - import_url = Gitlab::ImportUrl.new(value) + import_url = Gitlab::UrlSanitizer.new(value) create_or_update_import_data(credentials: import_url.credentials) super(import_url.sanitized_url) end def import_url if import_data && super - import_url = Gitlab::ImportUrl.new(super, credentials: import_data.credentials) + import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials) import_url.full_url else super diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 2937493c614..fbc7ed63c6a 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -13,7 +13,7 @@ class RepositoryImportWorker result = Projects::ImportService.new(project, current_user).execute if result[:status] == :error - project.update(import_error: result[:message]) + project.update(import_error: Gitlab::UrlSanitizer.sanitize(result[:message])) project.import_fail return end |