[PATCH 2/3] remote-curl: verify smart-http metadata lines
From: Jeff King <hidden>
Date: 2016-06-15 22:56:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
A smart http ref advertisement starts with a packet containing the service header, followed by an arbitrary number of packets containing other metadata headers, followed by a flush packet. We don't currently recognize any other metadata headers, so we just parse through any extra packets, throwing away their contents. However, we don't do so very carefully, and just stop at the first error or flush packet. Let's flag any errors we see here, which might be a sign of truncated or corrupted output. Since the rest of the data should be the ref advertisement, and since we pass that along to our helper programs (like fetch-pack), they will probably notice the error, as whatever cruft is in the buffer will not parse. However, it's nice to note problems as early as possible, which can help in debugging the root cause. Signed-off-by: Jeff King <redacted> --- remote-curl.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index 933c69a..73134f5 100644
--- a/remote-curl.c
+++ b/remote-curl.c@@ -90,6 +90,17 @@ static void free_discovery(struct discovery *d) } } +static int read_packets_until_flush(char **buf, size_t *len) +{ + while (1) { + int r = packet_get_line(NULL, buf, len); + if (r < 0) + return -1; + if (r == 0) + return 0; + } +} + static struct discovery* discover_refs(const char *service) { struct strbuf exp = STRBUF_INIT;
@@ -155,11 +166,13 @@ static struct discovery* discover_refs(const char *service) /* The header can include additional metadata lines, up * until a packet flush marker. Ignore these now, but - * in the future we might start to scan them. + * in the future we might start to scan them. However, we do + * still check to make sure we are getting valid packet lines, + * ending with a flush. */ - strbuf_reset(&buffer); - while (packet_get_line(&buffer, &last->buf, &last->len) > 0) - strbuf_reset(&buffer); + if (read_packets_until_flush(&last->buf, &last->len) < 0) + die("smart-http metadata lines are invalid at %s", + refs_url); last->proto_git = 1; }
--
1.8.1.2.11.g1a2f572