Merge pull request #30 from bdwyertech/fix_dk_test

Fix read_tar_magic to properly return an array when a file has less than 264 characters
chef · Aug 28, 2018 · cf4ca99 · cf4ca99
2 parents 77eb5b6 + 8446b32
commit cf4ca99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/mixlib/archive/tar.rb b/lib/mixlib/archive/tar.rb
@@ -125,7 +125,7 @@ def is_tar_archive?(io)
 
       def read_tar_magic(io)
         io.rewind
-        magic = io.read(512).bytes[257..264].pack("C*")
+        magic = Array(io.read(512).bytes[257..264]).pack("C*")
         io.rewind
         magic
       end

diff --git a/spec/mixlib/tar_spec.rb b/spec/mixlib/tar_spec.rb
@@ -98,6 +98,13 @@
         expect(extractor.send(:is_tar_archive?, raw)).to eq(false)
       end
     end
+    context "invalid small file" do
+      let(:data) { "testdir/#{Array.new(11) { "\x00" }.join}smallfile" }
+      it "does not identify an invalid header in a small file" do
+        extractor = described_class.new(tgz_archive)
+        expect(extractor.send(:is_tar_archive?, raw)).to eq(false)
+      end
+    end
   end
 
 end