Jeff KingFrom: Scott J. Goldman <scottjg@github.com>
In commit ee27ca4, we started restricting remote git-archive invocations to only accessing reachable commits. This matches what upload-pack allows, but does restrict some useful cases (e.g., HEAD:foo). We loosened this in 0f544ee, which allows `foo:bar` as long as `foo` is a ref tip. However, that still doesn't allow many useful things, like:
1. Commits accessible from a ref, like `foo^:bar`, which
is reachable2. Arbitrary sha1s, even if they are reachable.
We can do a full object-reachability check for these cases, but it can be quite expensive if the client has sent us the sha1 of a tree; we have to visit every sub-tree of every commit in the worst case.
Let's instead give site admins an escape hatch, in case they prefer the more liberal behavior. For many sites, the full object database is public anyway (e.g., if you allow dumb walker access), or the site admin may simply decide the security/convenience tradeoff is not worth it.
This patch adds a new config option to turn off the restrictions added in ee27ca4. It defaults to on, meaning there is no change in behavior by default.
Signed-off-by: Jeff King <peff@peff.net> --- Documentation/git-archive.txt | 7 +++++++ archive.c | 13 +++++++++++-- t/t5000-tar-tree.sh | 9 +++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)
Show changes to 3 files +27 −2
Documentation/git-archive.txt, archive.c, t/t5000-tar-tree.sh
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index b97aaab..486cb08 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -121,6 +121,13 @@ tar.<format>.remote:: user-defined formats, but true for the "tar.gz" and "tgz" formats. +archive.restrictRemote:: + If true, archives can only be requested by refnames. If false, + allows remote archive requests from arbitrary revisions. This + can be a security hazard, as archives could be requested for + unreachable commits that have been pruned from the repository. + Defaults to true. + [[ATTRIBUTES]] ATTRIBUTES ---------- diff --git a/archive.c b/archive.c index 346f3b2..13eb23a 100644 --- a/archive.c +++ b/archive.c @@ -17,6 +17,7 @@ static char const * const archive_usage[] = { static const struct archiver **archivers; static int nr_archivers; static int alloc_archivers; +static int git_archive_restrict_remote = 1; void register_archiver(struct archiver *ar) { @@ -257,7 +258,7 @@ static void parse_treeish_arg(const char **argv, unsigned char sha1[20]; /* Remotes are only allowed to fetch actual refs */ - if (remote) { + if (remote && git_archive_restrict_remote) { char *ref = NULL; const char *colon = strchr(name, ':'); int refnamelen = colon ? colon - name : strlen(name); @@ -401,6 +402,14 @@ static int parse_archive_args(int argc, const char **argv, return argc; } +static int git_default_archive_config(const char *var, const char *value, + void *cb) +{ + if (!strcmp(var, "archive.restrictremote")) + git_archive_restrict_remote = git_config_bool(var, value); + return git_default_config(var, value, cb); +} + int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote) { @@ -411,7 +420,7 @@ int write_archive(int argc, const char **argv, const char *prefix, if (setup_prefix && prefix == NULL) prefix = setup_git_directory_gently(&nongit); - git_config(git_default_config, NULL); + git_config(git_default_archive_config, NULL); init_tar_archiver(); init_zip_archiver(); diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 05f011d..eba285f 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -213,6 +213,15 @@ test_expect_success 'clients cannot access unreachable commits' ' test_must_fail git archive --remote=. $sha1 >remote.tar ' +test_expect_success 'clients can access unreachable commits' ' + test_commit unreachable1 && + sha1=`git rev-parse HEAD` && + git reset --hard HEAD^ && + git archive $sha1 >remote.tar && + test_config archive.restrictRemote false && + git archive --remote=. $sha1 >remote.tar +' + test_expect_success 'setup tar filters' ' git config tar.tar.foo.command "tr ab ba" && git config tar.bar.command "tr ab ba" &&
-- 1.8.5.2.500.g8060133
