diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-13 18:57:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-15 11:23:39 -0700 |
| commit | d8a1deecc6ef37728b951eaba051deb7e0a38af8 (patch) | |
| tree | 46880218861d52fb0c30d520030a70cd32bca163 | |
| parent | 03feddd6e8e779086ac2d131ded325f8e5601653 (diff) | |
| download | git-d8a1deecc6ef37728b951eaba051deb7e0a38af8.tar.gz | |
Refuse to create funny refs in clone-pack, git-fetch and receive-pack.
Using git-check-ref-format, make sure we do not create refs with
funny names when cloning from elsewhere (clone-pack), fast forwarding
local heads (git-fetch), or somebody pushes into us (receive-pack).
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | clone-pack.c | 6 | ||||
| -rwxr-xr-x | git-parse-remote.sh | 6 | ||||
| -rw-r--r-- | receive-pack.c | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/clone-pack.c b/clone-pack.c index 9a3371e1b2..0ea7e7f65d 100644 --- a/clone-pack.c +++ b/clone-pack.c @@ -36,6 +36,12 @@ static void write_one_ref(struct ref *ref) int fd; char *hex; + if (!strncmp(ref->name, "refs/", 5) && + check_ref_format(ref->name + 5)) { + error("refusing to create funny ref '%s' locally", ref->name); + return; + } + if (safe_create_leading_directories(path)) die("unable to create leading directory for %s", ref->name); fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0666); diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 5e75e15a7e..aea7b0e549 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -94,6 +94,12 @@ canon_refs_list_for_fetch () { heads/* | tags/* ) local="refs/$local" ;; *) local="refs/heads/$local" ;; esac + + if local_ref_name=$(expr "$local" : 'refs/\(.*\)') + then + git-check-ref-format "$local_ref_name" || + die "* refusing to create funny ref '$local_ref_name' locally" + fi echo "${dot_prefix}${force}${remote}:${local}" dot_prefix=. done diff --git a/receive-pack.c b/receive-pack.c index 06857eb77f..8f157bc3f0 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -95,6 +95,10 @@ static int update(const char *name, char new_hex[60], *old_hex, *lock_name; int newfd, namelen, written; + if (!strncmp(name, "refs/", 5) && check_ref_format(name + 5)) + return error("refusing to create funny ref '%s' locally", + name); + namelen = strlen(name); lock_name = xmalloc(namelen + 10); memcpy(lock_name, name, namelen); |