On Tue, Sep 14, 2021 at 11:37:06AM -0400, Jeff King wrote:
> Because each "ref-prefix" capability from the client comes in its own
> pkt-line, there's no limit to the number of them that a misbehaving
> client may send. We read them all into a strvec, which means the client
> can waste arbitrary amounts of our memory by just sending us "ref-prefix
> foo" over and over.
>
> One possible solution is to just drop the connection when the limit is
> reached. If we set it high enough, then only misbehaving or malicious
> clients would hit it. But "high enough" is vague, and it's unfriendly if
> we guess wrong and a legitimate client hits this.
>
> But we can do better. Since supporting the ref-prefix capability is
> optional anyway, the client has to further cull the response based on
> their own patterns. So we can simply ignore the patterns once we cross a
> certain threshold. Note that we have to ignore _all_ patterns, not just
> the ones past our limit (since otherwise we'd send too little data).
Right, because each ref-prefix line *adds* references to the advertised
set instead of culling them out. So as soon as we start ignoring even a
single ref-prefix line, we have to ignore all of them. Makes sense.
> The limit here is fairly arbitrary, and probably much higher than anyone
> would need in practice. It might be worth limiting it further, if only
> because we check it linearly (so with "m" local refs and "n" patterns,
> we do "m * n" string comparisons). But if we care about optimizing this,
> an even better solution may be a more advanced data structure anyway.
>
> I didn't bother making the limit configurable, since it's so high and
> since Git should behave correctly in either case. It wouldn't be too
> hard to do, but it makes both the code and documentation more complex.
Agreed. I don't think it's worth making it configurable because the
limit is so absurdly high that probably nobody will ever want to tweak
it.
> Signed-off-by: Jeff King <peff@xxxxxxxx>
> ---
> We're perhaps bending "optional" a little here. The client does know if
> we said "yes, we support ref-prefix" and until now, that meant they
> could trust us to cull. But no version of Git has ever relied on that
> (we tell the transport code "if you can limit by these prefixes, go for
> it" but then just post-process the result).
>
> The other option is that we could just say "no, you're sending too many
> prefixes" and hangup. This seemed friendlier to me (though either way, I
> really find it quite unlikely anybody would legitimately hit this
> limit).
FWIW, either (dropping the connection or the approach you took here)
would have been fine with me, but I find it unlikely that any real users
will notice ;).
> ls-refs.c | 19 +++++++++++++++++--
> t/t5701-git-serve.sh | 31 +++++++++++++++++++++++++++++++
> 2 files changed, 48 insertions(+), 2 deletions(-)
>
> diff --git a/ls-refs.c b/ls-refs.c
> index a1a0250607..839fb0caa9 100644
> --- a/ls-refs.c
> +++ b/ls-refs.c
> @@ -40,6 +40,12 @@ static void ensure_config_read(void)
> config_read = 1;
> }
>
> +/*
> + * The maximum number of "ref-prefix" lines we'll allow the client to send.
> + * If they go beyond this, we'll avoid using the prefix feature entirely.
> + */
> +#define MAX_ALLOWED_PREFIXES 65536
> +
> /*
> * Check if one of the prefixes is a prefix of the ref.
> * If no prefixes were provided, all refs match.
> @@ -141,6 +147,7 @@ static int ls_refs_config(const char *var, const char *value, void *data)
> int ls_refs(struct repository *r, struct packet_reader *request)
> {
> struct ls_refs_data data;
> + int too_many_prefixes = 0;
>
> memset(&data, 0, sizeof(data));
> strvec_init(&data.prefixes);
> @@ -156,8 +163,16 @@ int ls_refs(struct repository *r, struct packet_reader *request)
> data.peel = 1;
> else if (!strcmp("symrefs", arg))
> data.symrefs = 1;
> - else if (skip_prefix(arg, "ref-prefix ", &out))
> - strvec_push(&data.prefixes, out);
> + else if (skip_prefix(arg, "ref-prefix ", &out)) {
> + if (too_many_prefixes) {
> + /* ignore any further ones */
> + } else if (data.prefixes.nr >= MAX_ALLOWED_PREFIXES) {
> + strvec_clear(&data.prefixes);
> + too_many_prefixes = 1;
> + } else {
> + strvec_push(&data.prefixes, out);
> + }
> + }
The order of this if-statement is a little odd to me, but obviously
correct. I might have wrote:
if (too_many_prefixes)
continue;
if (data.prefixes.nr < MAX_ALLOWED_PREFIXES) {
strvec_push(&data.prefixes, out);
} else {
too_many_prefixes = 1;
strvec_clear(&data.prefixes);
}
But certainly what you wrote here works just fine (so this is a cosmetic
comment, and not a functional one).
> else if (!strcmp("unborn", arg))
> data.unborn = allow_unborn;
> }
> diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
> index 930721f053..b095bfa0ac 100755
> --- a/t/t5701-git-serve.sh
> +++ b/t/t5701-git-serve.sh
> @@ -158,6 +158,37 @@ test_expect_success 'refs/heads prefix' '
> test_cmp expect actual
> '
>
> +test_expect_success 'ignore very large set of prefixes' '
> + # generate a large number of ref-prefixes that we expect
> + # to match nothing; the value here exceeds MAX_ALLOWED_PREFIXES
> + # from ls-refs.c.
> + {
> + echo command=ls-refs &&
> + echo object-format=$(test_oid algo)
> + echo 0001 &&
> + perl -le "print \"refs/heads/$_\" for (1..65536+1)" &&
> + echo 0000
> + } |
> + test-tool pkt-line pack >in &&
> +
> + # and then confirm that we see unmatched prefixes anyway (i.e.,
> + # that the prefix was not applied).
> + cat >expect <<-EOF &&
> + $(git rev-parse HEAD) HEAD
> + $(git rev-parse refs/heads/dev) refs/heads/dev
> + $(git rev-parse refs/heads/main) refs/heads/main
> + $(git rev-parse refs/heads/release) refs/heads/release
> + $(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
> + $(git rev-parse refs/tags/one) refs/tags/one
> + $(git rev-parse refs/tags/two) refs/tags/two
You could have written this as a loop over the unmatched prefixes, but I
vastly prefer the result you came up with, which is much more explicit
and doesn't require readers to parse out what the loop does.
So this part looks very good to me.
Thanks,
Taylor
