diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-21 07:22:12 -0400 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-21 14:49:51 -0400 |
| commit | 794b4c5579075ec5361b4ab864052d0717b29492 (patch) | |
| tree | 8d1c91119835e37bcc077856ce6b30e8c6cbe0a8 | |
| parent | cfccb2785fb8b98a013170aae4b931e9431739d1 (diff) | |
| download | gitlab-ce-794b4c5579075ec5361b4ab864052d0717b29492.tar.gz | |
Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-check
In gitlab-org/gitlab-ee!2976, we saw that a given OID could point
to a commit, which would cause the delta size check to fail.
Gitaly already returns nil if the OID isn't a blob, so this change
makes the Rugged implementation consistent.
| -rw-r--r-- | lib/gitlab/git/blob.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/blob_spec.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb index 8d96826f6ee..a4336facee5 100644 --- a/lib/gitlab/git/blob.rb +++ b/lib/gitlab/git/blob.rb @@ -32,6 +32,8 @@ module Gitlab else blob = repository.lookup(sha) + next unless blob.is_a?(Rugged::Blob) + new( id: blob.oid, size: blob.size, diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb index 66ba00acb7d..f3945e748ab 100644 --- a/spec/lib/gitlab/git/blob_spec.rb +++ b/spec/lib/gitlab/git/blob_spec.rb @@ -119,10 +119,13 @@ describe Gitlab::Git::Blob, seed_helper: true do shared_examples 'finding blobs by ID' do let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) } + let(:bad_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::BigCommit::ID) } + it { expect(raw_blob.id).to eq(SeedRepo::RubyBlob::ID) } it { expect(raw_blob.data[0..10]).to eq("require \'fi") } it { expect(raw_blob.size).to eq(669) } it { expect(raw_blob.truncated?).to be_falsey } + it { expect(bad_blob).to be_nil } context 'large file' do it 'limits the size of a large file' do |