From: Jeff King <peff@peff.net>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/7] t: introduce tests for unexpected object types
Date: Fri, 5 Apr 2019 14:31:42 -0400 [thread overview]
Message-ID: <20190405183142.GD2284@sigill.intra.peff.net> (raw)
In-Reply-To: <ef6b4f380435d9743a56f47f68c18123bf0a0933.1554435033.git.me@ttaylorr.com>
On Thu, Apr 04, 2019 at 08:37:44PM -0700, Taylor Blau wrote:
> Let A be the object referenced with an unexpected type, and B be the
> object doing the referencing. Do the following:
>
> - test 'git rev-list --objects A B'. This causes A to be "cached", and
> presents the above scenario.
>
> Likewise, if we have a tree entry that claims to be a tree (for example)
> but points to another object type (say, a blob), there are two ways we
> might find out:
>
> - when we call lookup_tree(), we might find that we've already seen
> the object referenced as another type, in which case we'd get NULL
>
> - we call lookup_tree() successfully, but when we try to read the
> object, we find out it's something else.
>
> We should check that we behave sensibly in both cases (especially
> because it is easy for a malicious actor to provoke one case or the
> other).
I think our pasting together of multiple commits adding the lone/seen
cases ended up in some redundancy in the description. In particular, I'm
not sure what the first paragraph/bullet quoted above is trying to say,
as it corresponds to the second bullet in the later list. Maybe collapse
them together like:
We might hit an unexpected type in two different ways (imagine we have
a tree entry that claims to be a tree but actually points to a blob):
- when we call lookup_tree(), we might find that we've already seen
the object referenced as a blob, in which case we'd get NULL. We
can exercise this with "git rev-list --objects $blob $tree", which
guarantees that the blob will have been parsed before we look in
the tree. These tests are marked as "seen" in the test script.
- we call lookup_tree() successfully, but when we try to read the
object, we find out it's something else. We construct our tests
such that $blob is not otherwise mentioned in $tree. These tests
are marked as "lone" in the script.
-Peff
next prev parent reply other threads:[~2019-04-05 18:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 3:37 [PATCH 0/7] harden unexpected object types checks Taylor Blau
2019-04-05 3:37 ` [PATCH 1/7] t: move 'hex2oct' into test-lib-functions.sh Taylor Blau
2019-04-05 3:37 ` [PATCH 2/7] t: introduce tests for unexpected object types Taylor Blau
2019-04-05 10:50 ` SZEDER Gábor
2019-04-05 18:24 ` Jeff King
2019-04-05 18:42 ` SZEDER Gábor
2019-04-05 18:52 ` Jeff King
2019-04-07 21:00 ` Ævar Arnfjörð Bjarmason
2019-04-09 2:29 ` Taylor Blau
2019-04-09 9:14 ` Ævar Arnfjörð Bjarmason
2019-04-10 1:59 ` Taylor Blau
2019-04-08 5:27 ` Junio C Hamano
2019-04-05 19:25 ` Eric Sunshine
2019-04-05 20:53 ` Jeff King
2019-04-06 5:33 ` Taylor Blau
2019-04-08 6:44 ` Junio C Hamano
2019-04-09 2:30 ` Taylor Blau
2019-04-09 3:28 ` Eric Sunshine
2019-04-09 5:08 ` Taylor Blau
2019-04-09 8:02 ` Eric Sunshine
2019-04-10 1:54 ` Taylor Blau
2019-04-06 5:31 ` Taylor Blau
2019-04-05 18:31 ` Jeff King [this message]
2019-04-06 5:23 ` Taylor Blau
2019-04-05 3:37 ` [PATCH 3/7] list-objects.c: handle unexpected non-blob entries Taylor Blau
2019-04-05 3:37 ` [PATCH 4/7] list-objects.c: handle unexpected non-tree entries Taylor Blau
2019-04-05 3:37 ` [PATCH 5/7] get_commit_tree(): return NULL for broken tree Taylor Blau
2019-04-05 3:37 ` [PATCH 6/7] rev-list: let traversal die when --missing is not in use Taylor Blau
2019-04-05 18:41 ` Jeff King
2019-04-06 5:36 ` Taylor Blau
2019-04-07 13:41 ` Jeff King
2019-04-09 2:11 ` Taylor Blau
2019-04-05 3:37 ` [PATCH 7/7] rev-list: detect broken root trees Taylor Blau
2019-04-10 2:13 ` [PATCH v2 0/7] harden unexpected object types checks Taylor Blau
2019-04-10 2:13 ` [PATCH v2 1/7] t: move 'hex2oct' into test-lib-functions.sh Taylor Blau
2019-04-10 2:13 ` [PATCH v2 2/7] t: introduce tests for unexpected object types Taylor Blau
2019-04-10 2:13 ` [PATCH v2 3/7] list-objects.c: handle unexpected non-blob entries Taylor Blau
2019-04-10 2:13 ` [PATCH v2 4/7] list-objects.c: handle unexpected non-tree entries Taylor Blau
2019-04-10 2:13 ` [PATCH v2 5/7] get_commit_tree(): return NULL for broken tree Taylor Blau
2019-04-10 2:13 ` [PATCH v2 6/7] rev-list: let traversal die when --missing is not in use Taylor Blau
2019-04-10 2:13 ` [PATCH v2 7/7] rev-list: detect broken root trees Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405183142.GD2284@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).