undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serve: drop "keys" strvec

Browse Source 
We collect the set of capabilities the client sends us in a strvec.
While this is usually small, there's no limit to the number of
capabilities the client can send us (e.g., they could just send us
"agent" pkt-lines over and over, and we'd keep adding them to the list).

Since all code has been converted away from using this list, let's get
rid of it. This avoids a potential attack where clients waste our
memory.

Note that we do have to replace it with a flag, because some of the
flush-packet logic checks whether we've seen any valid commands or keys.

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:35:29 -04:00 committed by Junio C Hamano
parent ab539c9094
commit f0a35c9ce5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serve.c
View File

@ -239,7 +239,7 @@ static int process_request(void)
{ {
enum request_state state = PROCESS_REQUEST_KEYS; enum request_state state = PROCESS_REQUEST_KEYS;
struct packet_reader reader; struct packet_reader reader;
struct strvec keys = STRVEC_INIT; int seen_capability_or_command = 0;
struct protocol_capability *command = NULL; struct protocol_capability *command = NULL;
packet_reader_init(&reader, 0, NULL, 0, packet_reader_init(&reader, 0, NULL, 0,
@ -260,10 +260,9 @@ static int process_request(void)
case PACKET_READ_EOF: case PACKET_READ_EOF:
BUG("Should have already died when seeing EOF"); BUG("Should have already died when seeing EOF");
case PACKET_READ_NORMAL: case PACKET_READ_NORMAL:
/* collect request; a sequence of keys and values */
if (parse_command(reader.line, &command) || if (parse_command(reader.line, &command) ||
receive_client_capability(reader.line)) receive_client_capability(reader.line))
strvec_push(&keys, reader.line); seen_capability_or_command = 1;
else else
die("unknown capability '%s'", reader.line); die("unknown capability '%s'", reader.line);
@ -275,7 +274,7 @@ static int process_request(void)
* If no command and no keys were given then the client * If no command and no keys were given then the client
* wanted to terminate the connection. * wanted to terminate the connection.
*/ */
if (!keys.nr) if (!seen_capability_or_command)
return 1; return 1;
/* /*
@ -309,7 +308,6 @@ static int process_request(void)
command->command(the_repository, &reader); command->command(the_repository, &reader);
strvec_clear(&keys);
return 0; return 0;
} }