mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-16 20:44:09 +02:00
Code

serve: reject commands used as capabilities 

Our table of v2 "capabilities" contains everything we might tell the
client we support. But there are differences in how we expect the client
to respond. Some of the entries are true capabilities (i.e., we expect
the client to say "yes, I support this"), and some are ones we expect
them to send as commands (with "command=ls-refs" or similar).

When we receive a capability used as a command, we complain about that.
But when we receive a command used as a capability (e.g., just "ls-refs"
in a pkt-line by itself), we silently ignore it.

This isn't really hurting anything (clients shouldn't send it, and we'll
ignore it), but we can tighten up the protocol to match what we expect
to happen.

There are two new tests here. The first one checks a capability used as
a command, which already passes. The second tests a command as a
capability, which this patch fixes.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2021-09-15 14:36:36 -04:00 committed by Junio C Hamano
parent 108c265f27
commit 0ab7eeccd9
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serve.c
View File

@ -201,7 +201,7 @@ static int receive_client_capability(const char *key)
const char *value;
const struct protocol_capability *c = get_capability(key, &value);
if (!c || !c->advertise(the_repository, NULL))
if (!c || c->command || !c->advertise(the_repository, NULL))
return 0;
if (c->receive)

21
t/t5701-git-serve.sh
View File

@ -72,6 +72,27 @@ test_expect_success 'request invalid command' '
test_i18ngrep "invalid command" err
'
test_expect_success 'request capability as command' '
test-tool pkt-line pack >in <<-EOF &&
command=agent
object-format=$(test_oid algo)
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
grep invalid.command.*agent err
'
test_expect_success 'request command as capability' '
test-tool pkt-line pack >in <<-EOF &&
command=ls-refs
object-format=$(test_oid algo)
fetch
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
grep unknown.capability err
'
test_expect_success 'requested command is command=value' '
test-tool pkt-line pack >in <<-EOF &&
command=ls-refs=whatever