@matheusbsbs / matheus-bagliano / commits / 565ebbf79f
Fork 0

upload-pack: tighten request validation.

This makes sure what the other end asks for are among what we offered to give them. Otherwise we would end up running git-rev-list with 20-byte nonsense, only to find it either die (because the object was not found) or waste time (because we ended up serving that phony 'client'). Also avoid wasting needs_sha1 pool to record duplicates, and detect cloning requests better. [this used to be on top of Johannes fetch-pack enhancements, which we are rewinding it for further testing for now, so the commit is rebased.] Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Oct 24, 2005 at 18:59 UTC 565ebbf79f61873042c22a7126d002c104e056f4
1 file changed +27 -4
upload-pack.c
+27 -4
@@ -6,9 +6,11 @@
6
7 static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
8
9 +#define OUR_REF (1U << 1)
10 +#define WANTED (1U << 2)
11 #define MAX_HAS 256
12 #define MAX_NEEDS 256
11 -static int nr_has = 0, nr_needs = 0;
13 +static int nr_has = 0, nr_needs = 0, nr_our_refs = 0;
14 static unsigned char has_sha1[MAX_HAS][20];
15 static unsigned char needs_sha1[MAX_NEEDS][20];
16 static unsigned int timeout = 0;
@@ -29,6 +31,7 @@ static void create_pack_file(void)
31 {
32 int fd[2];
33 pid_t pid;
34 + int create_full_pack = (nr_our_refs == nr_needs && !nr_has);
35
36 if (pipe(fd) < 0)
37 die("git-upload-pack: unable to create pipe");
@@ -43,8 +46,8 @@ static void create_pack_file(void)
46 char *buf;
47 char **p;
48
46 - if (MAX_NEEDS <= nr_needs)
47 - args = nr_has + 10;
49 + if (create_full_pack)
50 + args = 10;
51 else
52 args = nr_has + nr_needs + 5;
53 argv = xmalloc(args * sizeof(char *));
@@ -151,6 +154,7 @@ static int receive_needs(void)
154
155 needs = 0;
156 for (;;) {
157 + struct object *o;
158 unsigned char dummy[20], *sha1_buf;
159 len = packet_read_line(0, line, sizeof(line));
160 reset_timeout();
@@ -170,7 +174,22 @@ static int receive_needs(void)
174 if (strncmp("want ", line, 5) || get_sha1_hex(line+5, sha1_buf))
175 die("git-upload-pack: protocol error, "
176 "expected to get sha, not '%s'", line);
173 - needs++;
177 +
178 + /* We have sent all our refs already, and the other end
179 + * should have chosen out of them; otherwise they are
180 + * asking for nonsense.
181 + *
182 + * Hmph. We may later want to allow "want" line that
183 + * asks for something like "master~10" (symbolic)...
184 + * would it make sense? I don't know.
185 + */
186 + o = lookup_object(sha1_buf);
187 + if (!o || !(o->flags & OUR_REF))
188 + die("git-upload-pack: not our ref %s", line+5);
189 + if (!(o->flags & WANTED)) {
190 + o->flags |= WANTED;
191 + needs++;
192 + }
193 }
194 }
195
@@ -179,6 +198,10 @@ static int send_ref(const char *refname, const unsigned char *sha1)
198 struct object *o = parse_object(sha1);
199
200 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
201 + if (!(o->flags & OUR_REF)) {
202 + o->flags |= OUR_REF;
203 + nr_our_refs++;
204 + }
205 if (o->type == tag_type) {
206 o = deref_tag(o);
207 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);