diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-15 15:49:53 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-15 15:51:14 +0300 |
commit | b9ca48a8952564d50414df322b825758ecbbb716 (patch) | |
tree | 0370fc2cb6826f5391f3a74e927e95bfd6ab62ac /lib | |
parent | bc9391c294422742a7c0f904cbac4e841a73ae9e (diff) |
Merge branch 'security-2770-verify-bundle-import-files-11-6' into 'security-11-6'
[11.6] Validate bundle files before unpacking them
See merge request gitlab/gitlabhq!2774
(cherry picked from commit ad73bf817253ec4fc3fae8c7fb60898f11922218)
5f2fe991 Validate bundle files before unpacking them
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/bundle_file.rb | 30 | ||||
-rw-r--r-- | lib/gitlab/git/repository.rb | 5 |
2 files changed, 35 insertions, 0 deletions
diff --git a/lib/gitlab/git/bundle_file.rb b/lib/gitlab/git/bundle_file.rb new file mode 100644 index 00000000000..8384a436fcc --- /dev/null +++ b/lib/gitlab/git/bundle_file.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +module Gitlab + module Git + class BundleFile + # All git bundle files start with this string + # + # https://github.com/git/git/blob/v2.20.1/bundle.c#L15 + MAGIC = "# v2 git bundle\n" + + InvalidBundleError = Class.new(StandardError) + + attr_reader :filename + + def self.check!(filename) + new(filename).check! + end + + def initialize(filename) + @filename = filename + end + + def check! + data = File.open(filename, 'r') { |f| f.read(MAGIC.size) } + + raise InvalidBundleError, 'Invalid bundle file' unless data == MAGIC + end + end + end +end diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 5bbedc9d5e3..786c90f9272 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -789,6 +789,11 @@ module Gitlab end def create_from_bundle(bundle_path) + # It's important to check that the linked-to file is actually a valid + # .bundle file as it is passed to `git clone`, which may otherwise + # interpret it as a pointer to another repository + ::Gitlab::Git::BundleFile.check!(bundle_path) + gitaly_repository_client.create_from_bundle(bundle_path) end |