Skip to content

Commit ee28d9d

Browse files
jeffhostetlerdscho
authored andcommitted
t7599: create corrupt blob test
Teach helper/test-gvfs-protocol to be able to send corrupted loose blobs. Add unit test for gvfs-helper to detect receipt of a corrupted loose blob. Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 8f67279 commit ee28d9d

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

t/helper/test-gvfs-protocol.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,8 @@ static enum worker_result send_loose_object(const struct object_id *oid,
509509
unsigned long size;
510510
enum object_type type;
511511
struct object_info oi = OBJECT_INFO_INIT;
512+
int mayhem__corrupt_loose = string_list_has_string(&mayhem_list,
513+
"corrupt_loose");
512514

513515
/*
514516
* Since `test-gvfs-protocol` is mocking a real GVFS server (cache or
@@ -625,7 +627,22 @@ static enum worker_result send_loose_object(const struct object_id *oid,
625627
do {
626628
enum worker_result wr;
627629
unsigned char *in0 = stream.next_in;
630+
631+
/*
632+
* Corrupt a byte in the buffer we compress, but undo it
633+
* before we compute the SHA on the portion of the raw
634+
* buffer included in the chunk we compressed.
635+
*/
636+
if (mayhem__corrupt_loose) {
637+
logmayhem("corrupt_loose");
638+
*in0 = *in0 ^ 0xff;
639+
}
640+
628641
ret = git_deflate(&stream, Z_FINISH);
642+
643+
if (mayhem__corrupt_loose)
644+
*in0 = *in0 ^ 0xff;
645+
629646
the_hash_algo->update_fn(&c, in0, stream.next_in - in0);
630647

631648
/* [5] */

t/t5799-gvfs-helper.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,4 +1047,36 @@ test_expect_success 'integration: fully implicit: diff 2 commits' '
10471047
>OUT.output 2>OUT.stderr
10481048
'
10491049

1050+
#################################################################
1051+
# Ensure that the SHA of the blob we received matches the SHA of
1052+
# the blob we requested.
1053+
#################################################################
1054+
1055+
# Request a loose blob from the server. Verify that we received
1056+
# content matches the requested SHA.
1057+
#
1058+
test_expect_success 'catch corrupted loose object' '
1059+
# test_when_finished "per_test_cleanup" &&
1060+
start_gvfs_protocol_server_with_mayhem corrupt_loose &&
1061+
1062+
test_must_fail \
1063+
git -C "$REPO_T1" gvfs-helper \
1064+
--cache-server=trust \
1065+
--remote=origin \
1066+
get \
1067+
<"$OID_ONE_BLOB_FILE" >OUT.output 2>OUT.stderr &&
1068+
1069+
stop_gvfs_protocol_server &&
1070+
1071+
# Verify corruption detected.
1072+
# Verify valid blob not included in response to client.
1073+
1074+
grep "hash failed for received loose object" OUT.stderr &&
1075+
1076+
# Verify that we did not write the corrupted blob to the ODB.
1077+
1078+
! verify_objects_in_shared_cache "$OID_ONE_BLOB_FILE" &&
1079+
git -C "$REPO_T1" fsck
1080+
'
1081+
10501082
test_done

0 commit comments

Comments
 (0)