fsck: actually detect bad file modes in trees

We use the normal tree_desc code to iterate over trees in fsck, meaning we only see the canonicalized modes it returns. And hence we'd never see anything unexpected, since it will coerce literally any garbage into one of our normal and accepted modes. We can use the new RAW_MODES flag to see the real modes, and then use the existing code to actually analyze them. The existing code is written as allow-known-good, so there's not much point in testing a variety of breakages. The one tested here should be S_IFREG but with nonsense permissions. Do note that the error-reporting here isn't great. We don't mention the specific bad mode, but just that the tree has one or more broken modes. But when you go to look at it with "git ls-tree", we'll report the canonicalized mode! This isn't ideal, but given that this should come up rarely, and that any number of other tree corruptions might force you into looking at the binary bytes via "cat-file", it's not the end of the world. And it's something we can improve on top later if we choose. Reported-by: Xavier Morel <xavier.morel@masklinn.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 10, 2022 at 17:02 UTC 53602a937dc9eacd67b6afcd781f7b15bb02682f
2 files changed +15 -1
fsck.c
+1 -1
@@ -578,7 +578,7 @@ static int fsck_tree(const struct object_id *tree_oid,
578 const char *o_name;
579 struct name_stack df_dup_candidates = { NULL };
580
581 - if (init_tree_desc_gently(&desc, buffer, size, 0)) {
581 + if (init_tree_desc_gently(&desc, buffer, size, TREE_DESC_RAW_MODES)) {
582 retval += report(options, tree_oid, OBJ_TREE,
583 FSCK_MSG_BAD_TREE,
584 "cannot be parsed as a tree");
t/t1450-fsck.sh
+14
@@ -364,6 +364,20 @@ test_expect_success 'tree entry with type mismatch' '
364 test_i18ngrep ! "dangling blob" out
365 '
366
367 +test_expect_success 'tree entry with bogus mode' '
368 + test_when_finished "remove_object \$blob" &&
369 + test_when_finished "remove_object \$tree" &&
370 + blob=$(echo blob | git hash-object -w --stdin) &&
371 + blob_oct=$(echo $blob | hex2oct) &&
372 + tree=$(printf "100000 foo\0${blob_oct}" |
373 + git hash-object -t tree --stdin -w --literally) &&
374 + git fsck 2>err &&
375 + cat >expect <<-EOF &&
376 + warning in tree $tree: badFilemode: contains bad file modes
377 + EOF
378 + test_cmp expect err
379 +'
380 +
381 test_expect_success 'tag pointing to nonexistent' '
382 badoid=$(test_oid deadbeef) &&
383 cat >invalid-tag <<-EOF &&