[PATCH v2 4/4] archive: allow archive over HTTP(S) with proto v2
Signed-off-by: Josh Steadmon <steadmon@google.com>
---
builtin/archive.c | 12 +++++++++++-
http-backend.c | 13 ++++++++++++-
transport-helper.c | 7 ++++---
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/builtin/archive.c b/builtin/archive.c
index f91d222677..78a259518d 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -87,7 +87,17 @@ static int run_remote_archiver(int argc, const char **argv,
status = packet_reader_read(&reader);
if (status == PACKET_READ_NORMAL && reader.pktlen > 0)
die(_("git archive: expected a flush"));
- }
+ } else if (version == protocol_v2 &&
+ (starts_with(transport->url, "http://") ||
+ starts_with(transport->url, "https://")))
+ /*
+ * Commands over HTTP require two requests, so there's an
+ * additional server response to parse. We do only basic sanity
+ * checking here that the versions presented match across
+ * requests.
+ */
+ if (version != discover_version(&reader))
+ die(_("git archive: received different protocol versions in subsequent requests"));
/* Now, start reading from fd[0] and spit it out to stdout */
rv = recv_sideband("archive", fd[0], 1);
diff --git a/http-backend.c b/http-backend.c
index 9e894f197f..8e262d50e0 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -32,6 +32,7 @@ struct rpc_service {
static struct rpc_service rpc_service[] = {
{ "upload-pack", "uploadpack", 1, 1 },
{ "receive-pack", "receivepack", 0, -1 },
+ { "upload-archive", "uploadarchive", 1, 1 },
};
static struct string_list *get_parameters(void)
@@ -637,6 +638,15 @@ static void service_rpc(struct strbuf *hdr, char *service_name)
struct rpc_service *svc = select_service(hdr, service_name);
struct strbuf buf = STRBUF_INIT;
+ if (!strcmp(service_name, "git-upload-archive")) {
+ /*
+ * git-upload-archive doesn't need --stateless-rpc, because it
+ * always handles only a single request.
+ */
+ argv[1] = ".";
+ argv[2] = NULL;
+ }
+
strbuf_reset(&buf);
strbuf_addf(&buf, "application/x-git-%s-request", svc->name);
check_content_type(hdr, buf.buf);
@@ -713,7 +723,8 @@ static struct service_cmd {
{"GET", "/objects/pack/pack-[0-9a-f]{40}\\.idx$", get_idx_file},
{"POST", "/git-upload-pack$", service_rpc},
- {"POST", "/git-receive-pack$", service_rpc}
+ {"POST", "/git-receive-pack$", service_rpc},
+ {"POST", "/git-upload-archive$", service_rpc},
};
static int bad_request(struct strbuf *hdr, const struct service_cmd *c)
diff --git a/transport-helper.c b/transport-helper.c
index 143ca008c8..c41c3dfcff 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -604,8 +604,9 @@ static int process_connect_service(struct transport *transport,
strbuf_addf(&cmdbuf, "connect %s\n", name);
ret = run_connect(transport, &cmdbuf);
} else if (data->stateless_connect &&
- (get_protocol_version_config() == protocol_v2) &&
- !strcmp("git-upload-pack", name)) {
+ get_protocol_version_config() == protocol_v2 &&
+ (!strcmp("git-upload-pack", name) ||
+ !strcmp("git-upload-archive", name))) {
strbuf_addf(&cmdbuf, "stateless-connect %s\n", name);
ret = run_connect(transport, &cmdbuf);
if (ret)
@@ -639,7 +640,7 @@ static int connect_helper(struct transport *transport, const char *name,
/* Get_helper so connect is inited. */
get_helper(transport);
- if (!data->connect)
+ if (!data->connect && !data->stateless_connect)
die(_("operation not supported by protocol"));
if (!process_connect_service(transport, name, exec))
--
2.19.0.605.g01d371f741-goog
Josh Steadmon <steadmon@google.com>