Validate LFS hrefs before downloading them

This commit is contained in:
Nick Thomas 2018-12-11 16:52:22 +00:00
parent 18a48e348b
commit 3ee0710d1d
No known key found for this signature in database
GPG Key ID: 2A313A47AFADACE9
3 changed files with 20 additions and 0 deletions

View File

@ -4,6 +4,8 @@
module Projects
module LfsPointers
class LfsDownloadService < BaseService
VALID_PROTOCOLS = %w[http https].freeze
# rubocop: disable CodeReuse/ActiveRecord
def execute(oid, url)
return unless project&.lfs_enabled? && oid.present? && url.present?
@ -11,6 +13,7 @@ module Projects
return if LfsObject.exists?(oid: oid)
sanitized_uri = Gitlab::UrlSanitizer.new(url)
Gitlab::UrlBlocker.validate!(sanitized_uri.sanitized_url, protocols: VALID_PROTOCOLS)
with_tmp_file(oid) do |file|
size = download_and_save_file(file, sanitized_uri)

View File

@ -0,0 +1,5 @@
---
title: Validate LFS hrefs before downloading them
merge_request:
author:
type: security

View File

@ -54,6 +54,18 @@ describe Projects::LfsPointers::LfsDownloadService do
end
end
context 'when a bad URL is used' do
where(download_link: ['/etc/passwd', 'ftp://example.com', 'http://127.0.0.2'])
with_them do
it 'does not download the file' do
expect(subject).not_to receive(:download_and_save_file)
expect { subject.execute(oid, download_link) }.not_to change { LfsObject.count }
end
end
end
context 'when an lfs object with the same oid already exists' do
before do
create(:lfs_object, oid: 'oid')