2006-09-07 13:12:05 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2006 Franck Bui-Huu
|
|
|
|
*/
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "archive.h"
|
|
|
|
#include "pkt-line.h"
|
2006-09-10 10:33:34 +00:00
|
|
|
#include "sideband.h"
|
2023-04-22 20:17:20 +00:00
|
|
|
#include "repository.h"
|
2011-11-19 07:40:04 +00:00
|
|
|
#include "run-command.h"
|
2020-07-28 20:23:39 +00:00
|
|
|
#include "strvec.h"
|
2006-09-07 13:12:05 +00:00
|
|
|
|
|
|
|
static const char upload_archive_usage[] =
|
2022-10-13 15:39:10 +00:00
|
|
|
"git upload-archive <repository>";
|
2006-09-07 13:12:05 +00:00
|
|
|
|
2006-09-10 10:33:34 +00:00
|
|
|
static const char deadchild[] =
|
2008-07-13 13:36:15 +00:00
|
|
|
"git upload-archive: archiver died with error";
|
2006-09-07 13:12:05 +00:00
|
|
|
|
2008-07-25 10:41:23 +00:00
|
|
|
#define MAX_ARGS (64)
|
2006-09-10 10:33:34 +00:00
|
|
|
|
2011-11-19 07:40:04 +00:00
|
|
|
int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
|
2006-09-07 13:12:05 +00:00
|
|
|
{
|
2020-07-28 20:24:27 +00:00
|
|
|
struct strvec sent_argv = STRVEC_INIT;
|
2006-09-07 13:12:05 +00:00
|
|
|
const char *arg_cmd = "argument ";
|
|
|
|
|
2017-05-30 05:13:43 +00:00
|
|
|
if (argc != 2 || !strcmp(argv[1], "-h"))
|
2011-11-15 23:39:33 +00:00
|
|
|
usage(upload_archive_usage);
|
|
|
|
|
2013-02-20 20:00:59 +00:00
|
|
|
if (!enter_repo(argv[1], 0))
|
|
|
|
die("'%s' does not appear to be a git repository", argv[1]);
|
2011-11-15 23:39:33 +00:00
|
|
|
|
2018-10-25 20:32:14 +00:00
|
|
|
init_archivers();
|
|
|
|
|
2006-09-07 13:12:05 +00:00
|
|
|
/* put received options in sent_argv[] */
|
2020-07-28 20:24:27 +00:00
|
|
|
strvec_push(&sent_argv, "git-upload-archive");
|
upload-archive: use argv_array to store client arguments
The current parsing scheme for upload-archive is to pack
arguments into a fixed-size buffer, separated by NULs, and
put a pointer to each argument in the buffer into a
fixed-size argv array.
This works fine, and the limits are high enough that nobody
reasonable is going to hit them, but it makes the code hard
to follow. Instead, let's just stuff the arguments into an
argv_array, which is much simpler. That lifts the "all
arguments must fit inside 4K together" limit.
We could also trivially lift the MAX_ARGS limitation (in
fact, we have to keep extra code to enforce it). But that
would mean a client could force us to allocate an arbitrary
amount of memory simply by sending us "argument" lines. By
limiting the MAX_ARGS, we limit an attacker to about 4
megabytes (64 times a maximum 64K packet buffer). That may
sound like a lot compared to the 4K limit, but it's not a
big deal compared to what git-archive will actually allocate
while working (e.g., to load blobs into memory). The
important thing is that it is bounded.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 20:01:26 +00:00
|
|
|
for (;;) {
|
pkt-line: provide a LARGE_PACKET_MAX static buffer
Most of the callers of packet_read_line just read into a
static 1000-byte buffer (callers which handle arbitrary
binary data already use LARGE_PACKET_MAX). This works fine
in practice, because:
1. The only variable-sized data in these lines is a ref
name, and refs tend to be a lot shorter than 1000
characters.
2. When sending ref lines, git-core always limits itself
to 1000 byte packets.
However, the only limit given in the protocol specification
in Documentation/technical/protocol-common.txt is
LARGE_PACKET_MAX; the 1000 byte limit is mentioned only in
pack-protocol.txt, and then only describing what we write,
not as a specific limit for readers.
This patch lets us bump the 1000-byte limit to
LARGE_PACKET_MAX. Even though git-core will never write a
packet where this makes a difference, there are two good
reasons to do this:
1. Other git implementations may have followed
protocol-common.txt and used a larger maximum size. We
don't bump into it in practice because it would involve
very long ref names.
2. We may want to increase the 1000-byte limit one day.
Since packets are transferred before any capabilities,
it's difficult to do this in a backwards-compatible
way. But if we bump the size of buffer the readers can
handle, eventually older versions of git will be
obsolete enough that we can justify bumping the
writers, as well. We don't have plans to do this
anytime soon, but there is no reason not to start the
clock ticking now.
Just bumping all of the reading bufs to LARGE_PACKET_MAX
would waste memory. Instead, since most readers just read
into a temporary buffer anyway, let's provide a single
static buffer that all callers can use. We can further wrap
this detail away by having the packet_read_line wrapper just
use the buffer transparently and return a pointer to the
static storage. That covers most of the cases, and the
remaining ones already read into their own LARGE_PACKET_MAX
buffers.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 20:02:57 +00:00
|
|
|
char *buf = packet_read_line(0, NULL);
|
|
|
|
if (!buf)
|
2006-09-07 13:12:05 +00:00
|
|
|
break; /* got a flush */
|
2020-07-29 00:37:20 +00:00
|
|
|
if (sent_argv.nr > MAX_ARGS)
|
upload-archive: use argv_array to store client arguments
The current parsing scheme for upload-archive is to pack
arguments into a fixed-size buffer, separated by NULs, and
put a pointer to each argument in the buffer into a
fixed-size argv array.
This works fine, and the limits are high enough that nobody
reasonable is going to hit them, but it makes the code hard
to follow. Instead, let's just stuff the arguments into an
argv_array, which is much simpler. That lifts the "all
arguments must fit inside 4K together" limit.
We could also trivially lift the MAX_ARGS limitation (in
fact, we have to keep extra code to enforce it). But that
would mean a client could force us to allocate an arbitrary
amount of memory simply by sending us "argument" lines. By
limiting the MAX_ARGS, we limit an attacker to about 4
megabytes (64 times a maximum 64K packet buffer). That may
sound like a lot compared to the 4K limit, but it's not a
big deal compared to what git-archive will actually allocate
while working (e.g., to load blobs into memory). The
important thing is that it is bounded.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 20:01:26 +00:00
|
|
|
die("Too many options (>%d)", MAX_ARGS - 1);
|
2006-09-07 13:12:05 +00:00
|
|
|
|
2013-11-30 20:55:40 +00:00
|
|
|
if (!starts_with(buf, arg_cmd))
|
upload-archive: use argv_array to store client arguments
The current parsing scheme for upload-archive is to pack
arguments into a fixed-size buffer, separated by NULs, and
put a pointer to each argument in the buffer into a
fixed-size argv array.
This works fine, and the limits are high enough that nobody
reasonable is going to hit them, but it makes the code hard
to follow. Instead, let's just stuff the arguments into an
argv_array, which is much simpler. That lifts the "all
arguments must fit inside 4K together" limit.
We could also trivially lift the MAX_ARGS limitation (in
fact, we have to keep extra code to enforce it). But that
would mean a client could force us to allocate an arbitrary
amount of memory simply by sending us "argument" lines. By
limiting the MAX_ARGS, we limit an attacker to about 4
megabytes (64 times a maximum 64K packet buffer). That may
sound like a lot compared to the 4K limit, but it's not a
big deal compared to what git-archive will actually allocate
while working (e.g., to load blobs into memory). The
important thing is that it is bounded.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 20:01:26 +00:00
|
|
|
die("'argument' token or flush expected");
|
2020-07-28 20:24:27 +00:00
|
|
|
strvec_push(&sent_argv, buf + strlen(arg_cmd));
|
2006-09-07 13:12:05 +00:00
|
|
|
}
|
2011-11-15 23:39:33 +00:00
|
|
|
|
|
|
|
/* parse all options sent by the client */
|
2020-07-29 00:37:20 +00:00
|
|
|
return write_archive(sent_argv.nr, sent_argv.v, prefix,
|
2018-08-13 16:14:35 +00:00
|
|
|
the_repository, NULL, 1);
|
2006-09-10 10:33:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-14 21:33:13 +00:00
|
|
|
__attribute__((format (printf, 1, 2)))
|
2006-09-12 07:26:57 +00:00
|
|
|
static void error_clnt(const char *fmt, ...)
|
|
|
|
{
|
2015-09-24 21:07:25 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2006-09-12 07:26:57 +00:00
|
|
|
va_list params;
|
|
|
|
|
|
|
|
va_start(params, fmt);
|
2015-09-24 21:07:25 +00:00
|
|
|
strbuf_vaddf(&buf, fmt, params);
|
2006-09-12 07:26:57 +00:00
|
|
|
va_end(params);
|
2015-09-24 21:07:25 +00:00
|
|
|
send_sideband(1, 3, buf.buf, buf.len, LARGE_PACKET_MAX);
|
|
|
|
die("sent error to the client: %s", buf.buf);
|
2006-09-12 07:26:57 +00:00
|
|
|
}
|
|
|
|
|
2009-06-17 10:11:10 +00:00
|
|
|
static ssize_t process_input(int child_fd, int band)
|
2006-09-12 07:26:57 +00:00
|
|
|
{
|
|
|
|
char buf[16384];
|
|
|
|
ssize_t sz = read(child_fd, buf, sizeof(buf));
|
|
|
|
if (sz < 0) {
|
2007-01-08 15:58:08 +00:00
|
|
|
if (errno != EAGAIN && errno != EINTR)
|
2006-09-12 07:26:57 +00:00
|
|
|
error_clnt("read error: %s\n", strerror(errno));
|
2009-06-17 10:11:10 +00:00
|
|
|
return sz;
|
2006-09-12 07:26:57 +00:00
|
|
|
}
|
|
|
|
send_sideband(1, band, buf, sz, LARGE_PACKET_MAX);
|
2009-06-17 10:11:10 +00:00
|
|
|
return sz;
|
2006-09-12 07:26:57 +00:00
|
|
|
}
|
|
|
|
|
2006-09-10 10:33:34 +00:00
|
|
|
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2021-11-25 22:52:17 +00:00
|
|
|
struct child_process writer = CHILD_PROCESS_INIT;
|
2011-11-19 07:40:04 +00:00
|
|
|
|
2023-03-28 20:55:17 +00:00
|
|
|
BUG_ON_NON_EMPTY_PREFIX(prefix);
|
|
|
|
|
2017-05-30 05:13:43 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage(upload_archive_usage);
|
|
|
|
|
2011-11-15 23:39:33 +00:00
|
|
|
/*
|
|
|
|
* Set up sideband subprocess.
|
|
|
|
*
|
|
|
|
* We (parent) monitor and read from child, sending its fd#1 and fd#2
|
|
|
|
* multiplexed out to our fd#1. If the child dies, we tell the other
|
|
|
|
* end over channel #3.
|
|
|
|
*/
|
2011-11-19 07:40:04 +00:00
|
|
|
writer.out = writer.err = -1;
|
|
|
|
writer.git_cmd = 1;
|
2021-11-25 22:52:17 +00:00
|
|
|
strvec_push(&writer.args, "upload-archive--writer");
|
|
|
|
strvec_pushv(&writer.args, argv + 1);
|
2011-11-19 07:40:04 +00:00
|
|
|
if (start_command(&writer)) {
|
2006-09-10 10:33:34 +00:00
|
|
|
int err = errno;
|
2016-10-16 23:20:29 +00:00
|
|
|
packet_write_fmt(1, "NACK unable to spawn subprocess\n");
|
2006-09-10 10:33:34 +00:00
|
|
|
die("upload-archive: %s", strerror(err));
|
|
|
|
}
|
|
|
|
|
2016-10-16 23:20:29 +00:00
|
|
|
packet_write_fmt(1, "ACK\n");
|
2006-09-07 13:12:05 +00:00
|
|
|
packet_flush(1);
|
|
|
|
|
2006-09-10 10:33:34 +00:00
|
|
|
while (1) {
|
|
|
|
struct pollfd pfd[2];
|
|
|
|
|
2011-11-19 07:40:04 +00:00
|
|
|
pfd[0].fd = writer.out;
|
2006-09-10 10:33:34 +00:00
|
|
|
pfd[0].events = POLLIN;
|
2011-11-19 07:40:04 +00:00
|
|
|
pfd[1].fd = writer.err;
|
2006-09-10 10:33:34 +00:00
|
|
|
pfd[1].events = POLLIN;
|
|
|
|
if (poll(pfd, 2, -1) < 0) {
|
|
|
|
if (errno != EINTR) {
|
2016-05-08 09:47:33 +00:00
|
|
|
error_errno("poll failed resuming");
|
2006-09-10 10:33:34 +00:00
|
|
|
sleep(1);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-12 07:26:57 +00:00
|
|
|
if (pfd[1].revents & POLLIN)
|
2006-09-10 10:33:34 +00:00
|
|
|
/* Status stream ready */
|
2009-11-11 22:24:42 +00:00
|
|
|
if (process_input(pfd[1].fd, 2))
|
|
|
|
continue;
|
|
|
|
if (pfd[0].revents & POLLIN)
|
|
|
|
/* Data stream ready */
|
|
|
|
if (process_input(pfd[0].fd, 1))
|
|
|
|
continue;
|
2006-09-12 07:26:57 +00:00
|
|
|
|
2011-11-19 07:40:04 +00:00
|
|
|
if (finish_command(&writer))
|
2006-09-12 07:26:57 +00:00
|
|
|
error_clnt("%s", deadchild);
|
2006-09-10 10:33:34 +00:00
|
|
|
packet_flush(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|