mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
8685da4256
Waaaaaaay back Git was considered to be secure as it never overwrote
an object it already had. This was ensured by always unpacking the
packfile received over the network (both in fetch and receive-pack)
and our already existing logic to not create a loose object for an
object we already have.
Lately however we keep "large-ish" packfiles on both fetch and push
by running them through index-pack instead of unpack-objects. This
would let an attacker perform a birthday attack.
How? Assume the attacker knows a SHA-1 that has two different
data streams. He knows the client is likely to have the "good"
one. So he sends the "evil" variant to the other end as part of
a "large-ish" packfile. The recipient keeps that packfile, and
indexes it. Now since this is a birthday attack there is a SHA-1
collision; two objects exist in the repository with the same SHA-1.
They have *very* different data streams. One of them is "evil".
Currently the poor recipient cannot tell the two objects apart,
short of by examining the timestamp of the packfiles. But lets
say the recipient repacks before he realizes he's been attacked.
We may wind up packing the "evil" version of the object, and deleting
the "good" one. This is made *even more likely* by Junio's recent
rearrange_packed_git patch (b867092f).
It is extremely unlikely for a SHA1 collisions to occur, but if it
ever happens with a remote (hence untrusted) object we simply must
not let the fetch succeed.
Normally received packs should not contain objects we already have.
But when they do we must ensure duplicated objects with the same SHA1
actually contain the same data.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
268 lines
6.9 KiB
Bash
Executable file
268 lines
6.9 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git-pack-object
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
TRASH=`pwd`
|
|
|
|
test_expect_success \
|
|
'setup' \
|
|
'rm -f .git/index*
|
|
for i in a b c
|
|
do
|
|
dd if=/dev/zero bs=4k count=1 | tr "\\0" $i >$i &&
|
|
git-update-index --add $i || return 1
|
|
done &&
|
|
cat c >d && echo foo >>d && git-update-index --add d &&
|
|
tree=`git-write-tree` &&
|
|
commit=`git-commit-tree $tree </dev/null` && {
|
|
echo $tree &&
|
|
echo $commit &&
|
|
git-ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
|
|
} >obj-list && {
|
|
git-diff-tree --root -p $commit &&
|
|
while read object
|
|
do
|
|
t=`git-cat-file -t $object` &&
|
|
git-cat-file $t $object || return 1
|
|
done <obj-list
|
|
} >expect'
|
|
|
|
test_expect_success \
|
|
'pack without delta' \
|
|
'packname_1=$(git-pack-objects --window=0 test-1 <obj-list)'
|
|
|
|
rm -fr .git2
|
|
mkdir .git2
|
|
|
|
test_expect_success \
|
|
'unpack without delta' \
|
|
"GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
git-init &&
|
|
git-unpack-objects -n <test-1-${packname_1}.pack &&
|
|
git-unpack-objects <test-1-${packname_1}.pack"
|
|
|
|
unset GIT_OBJECT_DIRECTORY
|
|
cd "$TRASH/.git2"
|
|
|
|
test_expect_success \
|
|
'check unpack without delta' \
|
|
'(cd ../.git && find objects -type f -print) |
|
|
while read path
|
|
do
|
|
cmp $path ../.git/$path || {
|
|
echo $path differs.
|
|
return 1
|
|
}
|
|
done'
|
|
cd "$TRASH"
|
|
|
|
test_expect_success \
|
|
'pack with REF_DELTA' \
|
|
'pwd &&
|
|
packname_2=$(git-pack-objects test-2 <obj-list)'
|
|
|
|
rm -fr .git2
|
|
mkdir .git2
|
|
|
|
test_expect_success \
|
|
'unpack with REF_DELTA' \
|
|
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
git-init &&
|
|
git-unpack-objects -n <test-2-${packname_2}.pack &&
|
|
git-unpack-objects <test-2-${packname_2}.pack'
|
|
|
|
unset GIT_OBJECT_DIRECTORY
|
|
cd "$TRASH/.git2"
|
|
test_expect_success \
|
|
'check unpack with REF_DELTA' \
|
|
'(cd ../.git && find objects -type f -print) |
|
|
while read path
|
|
do
|
|
cmp $path ../.git/$path || {
|
|
echo $path differs.
|
|
return 1
|
|
}
|
|
done'
|
|
cd "$TRASH"
|
|
|
|
test_expect_success \
|
|
'pack with OFS_DELTA' \
|
|
'pwd &&
|
|
packname_3=$(git-pack-objects --delta-base-offset test-3 <obj-list)'
|
|
|
|
rm -fr .git2
|
|
mkdir .git2
|
|
|
|
test_expect_success \
|
|
'unpack with OFS_DELTA' \
|
|
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
git-init &&
|
|
git-unpack-objects -n <test-3-${packname_3}.pack &&
|
|
git-unpack-objects <test-3-${packname_3}.pack'
|
|
|
|
unset GIT_OBJECT_DIRECTORY
|
|
cd "$TRASH/.git2"
|
|
test_expect_success \
|
|
'check unpack with OFS_DELTA' \
|
|
'(cd ../.git && find objects -type f -print) |
|
|
while read path
|
|
do
|
|
cmp $path ../.git/$path || {
|
|
echo $path differs.
|
|
return 1
|
|
}
|
|
done'
|
|
cd "$TRASH"
|
|
|
|
test_expect_success \
|
|
'compare delta flavors' \
|
|
'size_2=`stat -c "%s" test-2-${packname_2}.pack` &&
|
|
size_3=`stat -c "%s" test-3-${packname_3}.pack` &&
|
|
test $size_2 -gt $size_3'
|
|
|
|
rm -fr .git2
|
|
mkdir .git2
|
|
|
|
test_expect_success \
|
|
'use packed objects' \
|
|
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
git-init &&
|
|
cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {
|
|
git-diff-tree --root -p $commit &&
|
|
while read object
|
|
do
|
|
t=`git-cat-file -t $object` &&
|
|
git-cat-file $t $object || return 1
|
|
done <obj-list
|
|
} >current &&
|
|
diff expect current'
|
|
|
|
test_expect_success \
|
|
'use packed deltified (REF_DELTA) objects' \
|
|
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
rm .git2/objects/pack/test-* &&
|
|
cp test-2-${packname_2}.pack test-2-${packname_2}.idx .git2/objects/pack && {
|
|
git-diff-tree --root -p $commit &&
|
|
while read object
|
|
do
|
|
t=`git-cat-file -t $object` &&
|
|
git-cat-file $t $object || return 1
|
|
done <obj-list
|
|
} >current &&
|
|
diff expect current'
|
|
|
|
test_expect_success \
|
|
'use packed deltified (OFS_DELTA) objects' \
|
|
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
|
export GIT_OBJECT_DIRECTORY &&
|
|
rm .git2/objects/pack/test-* &&
|
|
cp test-3-${packname_3}.pack test-3-${packname_3}.idx .git2/objects/pack && {
|
|
git-diff-tree --root -p $commit &&
|
|
while read object
|
|
do
|
|
t=`git-cat-file -t $object` &&
|
|
git-cat-file $t $object || return 1
|
|
done <obj-list
|
|
} >current &&
|
|
diff expect current'
|
|
|
|
unset GIT_OBJECT_DIRECTORY
|
|
|
|
test_expect_success \
|
|
'verify pack' \
|
|
'git-verify-pack test-1-${packname_1}.idx \
|
|
test-2-${packname_2}.idx \
|
|
test-3-${packname_3}.idx'
|
|
|
|
test_expect_success \
|
|
'corrupt a pack and see if verify catches' \
|
|
'cp test-1-${packname_1}.idx test-3.idx &&
|
|
cp test-2-${packname_2}.pack test-3.pack &&
|
|
if git-verify-pack test-3.idx
|
|
then false
|
|
else :;
|
|
fi &&
|
|
|
|
: PACK_SIGNATURE &&
|
|
cp test-1-${packname_1}.pack test-3.pack &&
|
|
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
|
|
if git-verify-pack test-3.idx
|
|
then false
|
|
else :;
|
|
fi &&
|
|
|
|
: PACK_VERSION &&
|
|
cp test-1-${packname_1}.pack test-3.pack &&
|
|
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
|
|
if git-verify-pack test-3.idx
|
|
then false
|
|
else :;
|
|
fi &&
|
|
|
|
: TYPE/SIZE byte of the first packed object data &&
|
|
cp test-1-${packname_1}.pack test-3.pack &&
|
|
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
|
|
if git-verify-pack test-3.idx
|
|
then false
|
|
else :;
|
|
fi &&
|
|
|
|
: sum of the index file itself &&
|
|
l=`wc -c <test-3.idx` &&
|
|
l=`expr $l - 20` &&
|
|
cp test-1-${packname_1}.pack test-3.pack &&
|
|
dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
|
|
if git-verify-pack test-3.pack
|
|
then false
|
|
else :;
|
|
fi &&
|
|
|
|
:'
|
|
|
|
test_expect_success \
|
|
'build pack index for an existing pack' \
|
|
'cp test-1-${packname_1}.pack test-3.pack &&
|
|
git-index-pack -o tmp.idx test-3.pack &&
|
|
cmp tmp.idx test-1-${packname_1}.idx &&
|
|
|
|
git-index-pack test-3.pack &&
|
|
cmp test-3.idx test-1-${packname_1}.idx &&
|
|
|
|
cp test-2-${packname_2}.pack test-3.pack &&
|
|
git-index-pack -o tmp.idx test-2-${packname_2}.pack &&
|
|
cmp tmp.idx test-2-${packname_2}.idx &&
|
|
|
|
git-index-pack test-3.pack &&
|
|
cmp test-3.idx test-2-${packname_2}.idx &&
|
|
|
|
cp test-3-${packname_3}.pack test-3.pack &&
|
|
git-index-pack -o tmp.idx test-3-${packname_3}.pack &&
|
|
cmp tmp.idx test-3-${packname_3}.idx &&
|
|
|
|
git-index-pack test-3.pack &&
|
|
cmp test-3.idx test-3-${packname_3}.idx &&
|
|
|
|
:'
|
|
|
|
test_expect_success \
|
|
'fake a SHA1 hash collision' \
|
|
'test -f .git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67 &&
|
|
cp -f .git/objects/9d/235ed07cd19811a6ceb342de82f190e49c9f68 \
|
|
.git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67'
|
|
|
|
test_expect_failure \
|
|
'make sure index-pack detects the SHA1 collision' \
|
|
'git-index-pack -o bad.idx test-3.pack'
|
|
|
|
test_done
|